From 36edc6707cb49a71c8504d700a938f98fee31df4 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Fri, 5 Jun 2026 10:36:04 +0200 Subject: [PATCH 01/71] Keycloak authentication via x-user-id header --- .../auth-token.interceptor.spec.ts | 16 ------ .../interceptors/auth-token.interceptor.ts | 42 ---------------- .../interceptors/index.ts | 4 +- .../interceptors/user-header.interceptor.ts | 23 +++++++++ .../account-dialog.component.html | 22 ++------- .../account-dialog.component.ts | 49 ++++++------------- .../site/pages/login/login-routing.module.ts | 6 ++- .../site/services/auth-token.service.spec.ts | 8 +-- .../app/site/services/auth-token.service.ts | 24 +++++++++ client/src/app/site/services/auth.service.ts | 44 +++++++---------- .../src/app/site/services/operator.service.ts | 12 ++--- client/src/app/site/services/user.service.ts | 3 -- 12 files changed, 103 insertions(+), 150 deletions(-) delete mode 100644 client/src/app/openslides-main-module/interceptors/auth-token.interceptor.spec.ts delete mode 100644 client/src/app/openslides-main-module/interceptors/auth-token.interceptor.ts create mode 100644 client/src/app/openslides-main-module/interceptors/user-header.interceptor.ts diff --git a/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.spec.ts b/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.spec.ts deleted file mode 100644 index 085050987d..0000000000 --- a/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AuthTokenInterceptor } from './auth-token.interceptor'; - -xdescribe(`AuthTokenInterceptor`, () => { - beforeEach(() => - TestBed.configureTestingModule({ - providers: [AuthTokenInterceptor] - }) - ); - - it(`should be created`, () => { - const interceptor: AuthTokenInterceptor = TestBed.inject(AuthTokenInterceptor); - expect(interceptor).toBeTruthy(); - }); -}); diff --git a/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.ts b/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.ts deleted file mode 100644 index 74f80c99e7..0000000000 --- a/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { - HttpErrorResponse, - HttpEvent, - HttpHandler, - HttpInterceptor, - HttpRequest, - HttpResponse -} from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { Observable, tap } from 'rxjs'; - -import { AuthTokenService } from '../../site/services/auth-token.service'; - -@Injectable() -export class AuthTokenInterceptor implements HttpInterceptor { - public constructor(private authTokenService: AuthTokenService) {} - - public intercept(request: HttpRequest, next: HttpHandler): Observable> { - if (this.authTokenService.rawAccessToken) { - request = request.clone({ - setHeaders: { - authentication: this.authTokenService.rawAccessToken - } - }); - } - return next.handle(request).pipe( - tap({ - next: httpEvent => { - if (httpEvent instanceof HttpResponse && httpEvent.headers.get(`authentication`)) { - // Successful request - this.authTokenService.setRawAccessToken(httpEvent.headers.get(`Authentication`)); - } - }, - error: (error: unknown) => { - if (error instanceof HttpErrorResponse) { - // Here you can cache failed responses and try again - } - } - }) - ); - } -} diff --git a/client/src/app/openslides-main-module/interceptors/index.ts b/client/src/app/openslides-main-module/interceptors/index.ts index 9670d14dd9..751a729f71 100644 --- a/client/src/app/openslides-main-module/interceptors/index.ts +++ b/client/src/app/openslides-main-module/interceptors/index.ts @@ -2,12 +2,12 @@ import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { Provider } from '@angular/core'; import { AuthTokenService } from '../../site/services/auth-token.service'; -import { AuthTokenInterceptor } from './auth-token.interceptor'; +import { UserHeaderInterceptor } from './user-header.interceptor'; export const httpInterceptorProviders: Provider[] = [ { provide: HTTP_INTERCEPTORS, - useClass: AuthTokenInterceptor, + useClass: UserHeaderInterceptor, deps: [AuthTokenService], multi: true } diff --git a/client/src/app/openslides-main-module/interceptors/user-header.interceptor.ts b/client/src/app/openslides-main-module/interceptors/user-header.interceptor.ts new file mode 100644 index 0000000000..feff418a25 --- /dev/null +++ b/client/src/app/openslides-main-module/interceptors/user-header.interceptor.ts @@ -0,0 +1,23 @@ +import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Observable, tap } from 'rxjs'; + +import { AuthTokenService } from '../../site/services/auth-token.service'; + +@Injectable() +export class UserHeaderInterceptor implements HttpInterceptor { + public constructor(private authTokenService: AuthTokenService) {} + + public intercept(request: HttpRequest, next: HttpHandler): Observable> { + return next.handle(request).pipe( + tap({ + next: httpEvent => { + if (httpEvent instanceof HttpResponse && httpEvent.headers.get(`x-user-id`) !== null) { + this.authTokenService.setUserId(+httpEvent.headers.get(`x-user-id`)); + } + }, + error: (_error: unknown) => {} + }) + ); + } +} diff --git a/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.html b/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.html index 64b3d5bab1..5804ac9b66 100644 --- a/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.html +++ b/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.html @@ -14,6 +14,11 @@

} + + + {{ "Change Password" | translate }} + + @@ -26,9 +31,6 @@

@case (menuItemsRef.SHOW_MEETINGS) { } - @case (menuItemsRef.CHANGE_PASSWORD) { - - } } @@ -79,17 +81,3 @@

{{ 'My meetings' | translate }}

- - -

{{ 'Change password' | translate }}

- -
- -
- diff --git a/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.ts b/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.ts index 0a9021c897..5d0d67c33b 100644 --- a/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.ts +++ b/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.ts @@ -1,14 +1,11 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { MatSnackBar } from '@angular/material/snack-bar'; -import { TranslateService } from '@ngx-translate/core'; import { Permission } from 'src/app/domain/definitions/permission'; import { PasswordForm, PasswordFormComponent } from 'src/app/site/modules/user-components'; import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; import { PERSONAL_FORM_CONTROLS, ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { AuthService } from 'src/app/site/services/auth.service'; import { OperatorService } from 'src/app/site/services/operator.service'; import { UserService } from 'src/app/site/services/user.service'; import { UserControllerService } from 'src/app/site/services/user-controller.service'; @@ -40,9 +37,6 @@ export class AccountDialogComponent extends BaseUiComponent implements OnInit { }, { name: MenuItems.SHOW_MEETINGS - }, - { - name: MenuItems.CHANGE_PASSWORD } ]; @@ -86,6 +80,21 @@ export class AccountDialogComponent extends BaseUiComponent implements OnInit { return this._isEditing; } + public get keycloakPasswordResetLink(): string { + const instance_url = 'http://localhost:8080'; + const openslides_realm = 'openslides'; + const redirect_uri = 'https://localhost:8000/'; + + return ( + instance_url + + '/realms/' + + openslides_realm + + '/protocol/openid-connect/auth?client_id=proxy-client&redirect_uri=' + + redirect_uri + + '&response_type=code&scope=openid&kc_action=UPDATE_PASSWORD' + ); + } + public isUserFormValid = false; public isUserPasswordValid = false; public userPersonalForm: any; @@ -100,10 +109,7 @@ export class AccountDialogComponent extends BaseUiComponent implements OnInit { private operator: OperatorService, private repo: UserControllerService, private meetingRepo: MeetingControllerService, - private userService: UserService, - private snackbar: MatSnackBar, - private authService: AuthService, - private translate: TranslateService + private userService: UserService ) { super(); } @@ -124,8 +130,6 @@ export class AccountDialogComponent extends BaseUiComponent implements OnInit { if (event.key === `Enter` && event.shiftKey) { if (this.activeMenuItem === MenuItems.SHOW_PROFILE && this.isEditing && this.isUserFormValid) { this.saveUserChanges(); - } else if (this.activeMenuItem === MenuItems.CHANGE_PASSWORD && this.isUserPasswordValid) { - this.changePassword(); } } } @@ -151,27 +155,6 @@ export class AccountDialogComponent extends BaseUiComponent implements OnInit { return this.self!.groups(meeting.id); } - public async changePassword(): Promise { - const { oldPassword, newPassword }: PasswordForm = this.userPasswordForm; - - this.authService - .invalidateSessionAfter(() => this.repo.setPasswordSelf(this.self!, oldPassword, newPassword)) - .then(() => { - this.snackbar.open(this.translate.instant(`Password changed successfully!`), `Ok`); - this.changePasswordComponent.reset(); - this.dialogRef.close(); - }) - .catch(e => { - if (e?.message) { - this.snackbar.open(this.translate.instant(e.message), this.translate.instant(`OK`), { - duration: 0 - }); - } - - console.log(e); - }); - } - public async saveUserChanges(): Promise { if (this.self) { const payload = this.userPersonalForm; diff --git a/client/src/app/site/pages/login/login-routing.module.ts b/client/src/app/site/pages/login/login-routing.module.ts index 0f4acea979..8cdffcc985 100644 --- a/client/src/app/site/pages/login/login-routing.module.ts +++ b/client/src/app/site/pages/login/login-routing.module.ts @@ -10,7 +10,11 @@ const routes: Routes = [ children: [ { path: ``, - loadChildren: () => import(`./pages/login-mask/login-mask.module`).then(m => m.LoginMaskModule) + pathMatch: 'full', + redirectTo: (): null => { + window.location.href = '/system/login'; + return null; + } }, { path: `legalnotice`, diff --git a/client/src/app/site/services/auth-token.service.spec.ts b/client/src/app/site/services/auth-token.service.spec.ts index ba61822f3c..e9a9955907 100644 --- a/client/src/app/site/services/auth-token.service.spec.ts +++ b/client/src/app/site/services/auth-token.service.spec.ts @@ -11,13 +11,13 @@ describe(`AuthTokenService`, () => { service = TestBed.inject(AuthTokenService); }); - it(`should be created with empty token`, () => { + xit(`should be created with empty token`, () => { expect(service).toBeTruthy(); expect(service.rawAccessToken).toBe(null); expect(service.accessToken).toBe(null); }); - it(`check observable`, () => { + xit(`check observable`, () => { const token: AuthToken = { expiresAt: new Date(), userId: 1, sessionId: `test`, iat: 5, exp: 12 }; let test_token: AuthToken | null; const raw_token = `UNKNOWN.` + btoa(JSON.stringify(token)); @@ -26,7 +26,7 @@ describe(`AuthTokenService`, () => { expect(JSON.stringify(test_token)).toEqual(JSON.stringify(token)); }); - it(`set accessToken with setRawAccessToken`, () => { + xit(`set accessToken with setRawAccessToken`, () => { const token = { expiresAt: new Date(), userId: 1, sessionId: `test`, iat: 5, exp: 12 }; const raw_token = `UNKNOWN.` + btoa(JSON.stringify(token)); service.setRawAccessToken(raw_token); @@ -34,7 +34,7 @@ describe(`AuthTokenService`, () => { expect(JSON.stringify(service.accessToken)).toEqual(JSON.stringify(token)); }); - it(`set empty access token with setRawAccessToken`, () => { + xit(`set empty access token with setRawAccessToken`, () => { const token = { expiresAt: new Date(), userId: 1, sessionId: `test`, iat: 5, exp: 12 }; const raw_token = `UNKNOWN.` + btoa(JSON.stringify(token)); service.setRawAccessToken(raw_token); diff --git a/client/src/app/site/services/auth-token.service.ts b/client/src/app/site/services/auth-token.service.ts index b2385b40c6..a765ce605d 100644 --- a/client/src/app/site/services/auth-token.service.ts +++ b/client/src/app/site/services/auth-token.service.ts @@ -7,28 +7,52 @@ import { AuthToken } from '../../domain/interfaces/auth-token'; providedIn: `root` }) export class AuthTokenService { + /* @deprecated */ public get rawAccessToken(): string | null { return this._rawAccessToken; } + /* @deprecated */ public get accessTokenObservable(): Observable { return this._accessTokenSubject; } + /* @deprecated */ public get accessToken(): AuthToken | null { return this._accessTokenSubject.getValue(); } + public get userIdObservable(): Observable { + return this._userIdSubject; + } + + public get userId(): number | null { + return this._userIdSubject.getValue(); + } + // Use undefined as the state of not being initialized private _accessTokenSubject = new BehaviorSubject(null); private _rawAccessToken: string | null = null; + private _userIdSubject = new BehaviorSubject(null); + + /* @deprecated */ public setRawAccessToken(rawToken: string | null): void { this._rawAccessToken = rawToken; const token = this.parseToken(rawToken); this._accessTokenSubject.next(token); } + public setUserId(id: number): void { + if (!id) { + id = null; + } + + if (id !== this.userId) { + this._userIdSubject.next(id); + } + } + private parseToken(rawToken: string | null): AuthToken | null { if (!rawToken) { return null; diff --git a/client/src/app/site/services/auth.service.ts b/client/src/app/site/services/auth.service.ts index 89156d3fc4..4b14f96e74 100644 --- a/client/src/app/site/services/auth.service.ts +++ b/client/src/app/site/services/auth.service.ts @@ -23,6 +23,14 @@ export class AuthService { return this._authTokenSubject.getValue(); } + public get userIdObservable(): Observable { + return this._userIdSubject; + } + + public get userId(): number | null { + return this._userIdSubject.getValue(); + } + /** * "Pings" every time when a user logs out. */ @@ -44,6 +52,8 @@ export class AuthService { private readonly _logoutEvent = new EventEmitter(); private readonly _loginEvent = new EventEmitter(); + private readonly _userIdSubject = new BehaviorSubject(null); + public constructor( private lifecycleService: LifecycleService, private router: Router, @@ -53,19 +63,16 @@ export class AuthService { private cookie: CookieService, private DS: DataStoreService ) { - this.authTokenService.accessTokenObservable.subscribe(token => { - this._authTokenSubject.next(token); + this.authTokenService.userIdObservable.subscribe(userId => { + this._userIdSubject.next(userId); }); this.sharedWorker.listenTo(`auth`).subscribe(msg => { switch (msg?.action) { case `new-user`: - this.authTokenService.setRawAccessToken(msg.content?.token); + this.authTokenService.setUserId(msg.content?.user); this.updateUser(msg.content?.user); break; - case `new-token`: - this.authTokenService.setRawAccessToken(msg.content?.token); - break; } }); } @@ -109,7 +116,7 @@ export class AuthService { this.router.navigate([`/`]); } else { this.lifecycleService.shutdown(); - this.authTokenService.setRawAccessToken(null); + this.authTokenService.setUserId(null); this._logoutEvent.emit(); await this.DS.clear(); this.lifecycleService.bootup(); @@ -121,7 +128,7 @@ export class AuthService { const response = await callback(); if (response?.success) { this.lifecycleService.shutdown(); - this.authTokenService.setRawAccessToken(null); + this.authTokenService.setUserId(null); this._logoutEvent.emit(); this.sharedWorker.sendMessage(`auth`, { action: `update` }); this.DS.deleteCollections(...this.DS.getCollections()); @@ -135,22 +142,7 @@ export class AuthService { } public async logout(): Promise { - this.lifecycleService.shutdown(); - const response = await this.authAdapter.logout(); - if (response?.success) { - this.authTokenService.setRawAccessToken(null); - } - this._logoutEvent.emit(); - this.sharedWorker.sendMessage(`auth`, { action: `update` }); - this.DS.deleteCollections(...this.DS.getCollections()); - await this.DS.clear(); - this.lifecycleService.bootup(); - // In case SAML is enabled, we need to redirect the user to the IDP - // to complete the logout-flow. Maybe there is a better way to check - // for activated SAML than checking if the response is a URL. - if (response?.message && URL.parse(response.message)) { - location.replace(response.message); - } + location.replace(`/system/logout`); } public async logoutAnonymous(): Promise { @@ -158,7 +150,7 @@ export class AuthService { } public isAuthenticated(): boolean { - return !!this.authTokenService.accessToken || this.cookie.check(`anonymous-auth`); + return !!this.authTokenService.userId || this.cookie.check(`anonymous-auth`); } /** @@ -179,7 +171,7 @@ export class AuthService { online = false; } } - console.log(`auth: WhoAmI done, online:`, online, `authenticated:`, !!this.authTokenService.accessToken); + console.log(`auth: WhoAmI done, online:`, online, `authenticated:`, !!this.authTokenService.userId); return online; } } diff --git a/client/src/app/site/services/operator.service.ts b/client/src/app/site/services/operator.service.ts index 755a84d527..eeace17619 100644 --- a/client/src/app/site/services/operator.service.ts +++ b/client/src/app/site/services/operator.service.ts @@ -44,7 +44,7 @@ const UNKOWN_USER_ID = -1; // this is an invalid id **and** not equal to 0, null }) export class OperatorService { public get operatorId(): number | null { - return this.isAnonymous || !this.authService.authToken ? null : this.authService.authToken.userId; + return this.isAnonymous || !this.authService.userId ? null : this.authService.userId; } public get isAnonymousLoggedIn(): boolean { @@ -52,7 +52,7 @@ export class OperatorService { } public get isAnonymous(): boolean { - return !this.authService.authToken; + return !this.authService.userId; } public get isAuthenticated(): boolean { @@ -282,18 +282,18 @@ export class OperatorService { ) { this.setNotReady(); // General environment in which the operator moves - this.authService.authTokenObservable.subscribe(token => { - if (token === undefined) { + this.authService.userIdObservable.subscribe(id => { + if (id === undefined) { return; } - const id = token ? token.userId : null; + if (id !== this._lastUserId) { console.debug(`operator: user changed from `, this._lastUserId, `to`, id); this._lastUserId = id; this.resetOperatorData(); this.operatorStateChange(true); } - if (token) { + if (id) { this.checkReadyState(); } }); diff --git a/client/src/app/site/services/user.service.ts b/client/src/app/site/services/user.service.ts index e61e612574..9a6249df8c 100644 --- a/client/src/app/site/services/user.service.ts +++ b/client/src/app/site/services/user.service.ts @@ -6,8 +6,6 @@ import { GetUserEditablePresenterService, GetUserScopePresenterService } from 's import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; import { OperatorService } from 'src/app/site/services/operator.service'; -import { MeetingControllerService } from '../pages/meetings/services/meeting-controller.service'; - export enum UserScope { MEETING = `meeting`, COMMITTEE = `committee`, @@ -22,7 +20,6 @@ export class UserService { private activeMeetingService: ActiveMeetingService, private presenter: GetUserScopePresenterService, private operator: OperatorService, - private meetingRepo: MeetingControllerService, private getUserEditablePresenter: GetUserEditablePresenterService ) {} From ed535e9c9ab1366885bf0261fd63348a7f72a479 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Fri, 5 Jun 2026 12:07:02 +0200 Subject: [PATCH 02/71] Fix reset link --- .../components/account-dialog/account-dialog.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.html b/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.html index 5804ac9b66..62908a1411 100644 --- a/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.html +++ b/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.html @@ -15,7 +15,7 @@

} - + {{ "Change Password" | translate }} From 8e17cce477312b21826ede3816abc35a7dbd827a Mon Sep 17 00:00:00 2001 From: Jan Malte Behrens Date: Thu, 11 Jun 2026 15:38:02 +0200 Subject: [PATCH 03/71] feat: Adopt new meta --- meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta b/meta index d3b883cb27..657f040586 160000 --- a/meta +++ b/meta @@ -1 +1 @@ -Subproject commit d3b883cb2777153dc9a99fc325d62b777be0f220 +Subproject commit 657f040586c764da674fce05bff58e13b93ad3a3 From 516ca5e658e21d64534a3433f2714eb1079ec1e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 09:00:57 +0200 Subject: [PATCH 04/71] Bump video.js from 8.23.7 to 8.23.8 in /client (#6322) --- client/package-lock.json | 10 +++++----- client/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index a6ee154c7d..c389c4c402 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -71,7 +71,7 @@ "qrcode": "^1.5.4", "rxjs": "^7.8.2", "tinycolor2": "1.6.0", - "video.js": "^8.23.7", + "video.js": "^8.23.8", "zone.js": "^0.16.1" }, "devDependencies": { @@ -14601,13 +14601,13 @@ } }, "node_modules/video.js": { - "version": "8.23.7", - "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.23.7.tgz", - "integrity": "sha512-cG4HOygYt+Z8j6Sf5DuK6OgEOoM+g9oGP6vpqoZRaD13aHE4PMITbyjJUXZcIQbgB0wJEadBRaVm5lJIzo2jAA==", + "version": "8.23.8", + "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.23.8.tgz", + "integrity": "sha512-plZuWxN4clhDESSpi3QLYVs6tgnnf9qT9SA4iahHwZEmdVSuUh4+O6vQPcA5XqiEDvjeBDJvLafH1bhkAXaXKQ==", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.28.4", - "@videojs/http-streaming": "^3.17.3", + "@videojs/http-streaming": "^3.17.4", "@videojs/vhs-utils": "^4.1.1", "@videojs/xhr": "2.7.0", "aes-decrypter": "^4.0.2", diff --git a/client/package.json b/client/package.json index 070d1a5e1e..ff52732cf2 100644 --- a/client/package.json +++ b/client/package.json @@ -94,7 +94,7 @@ "qrcode": "^1.5.4", "rxjs": "^7.8.2", "tinycolor2": "1.6.0", - "video.js": "^8.23.7", + "video.js": "^8.23.8", "zone.js": "^0.16.1" }, "devDependencies": { From c2ae08afad2867d1a439ea6b74e98f3c9612ccd1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 09:01:37 +0200 Subject: [PATCH 05/71] Bump typescript-eslint from 8.61.0 to 8.61.1 in /client (#6321) --- client/package-lock.json | 124 +++++++++++++++++++-------------------- client/package.json | 2 +- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index c389c4c402..61780c7dab 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -117,7 +117,7 @@ "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.61.0" + "typescript-eslint": "^8.61.1" } }, "../packages/openslides-motion-diff": { @@ -6069,17 +6069,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.0.tgz", - "integrity": "sha512-bFNvl9ZczlVb+wR2Akszf3gHfKVj/8WanXaGJ3UstTA7brNKg0cNdk6X1Psu5V7MZ2oQtzZKOEzIUehaoxbDGw==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.1.tgz", + "integrity": "sha512-ZPlVl3PB3et/59Ne0fv/sci6ZXz4T4Hp4nTJ56i/Y0gR89ARb+KphojTq6j+56E5PIezmOIOOWyY+aWQFd+IkQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.61.0", - "@typescript-eslint/type-utils": "8.61.0", - "@typescript-eslint/utils": "8.61.0", - "@typescript-eslint/visitor-keys": "8.61.0", + "@typescript-eslint/scope-manager": "8.61.1", + "@typescript-eslint/type-utils": "8.61.1", + "@typescript-eslint/utils": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -6092,22 +6092,22 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.61.0", + "@typescript-eslint/parser": "^8.61.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.61.0.tgz", - "integrity": "sha512-5B7PfA2e1NQGCnDHd/0lW7W3gvp3d59Ryw54FYO8Uswxo9f6ikw3AZV+Xj/TvpImmpsiYyUqAfhC6kJID1jF6w==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.61.1.tgz", + "integrity": "sha512-PJ5vePq5/ognBbrIcoC5+SHO5dfpeLPzP9FpLkzWrguoYQEeeSjlJpVwOpo1JRSTEi7dRcwNy4h4dzV70PqHcg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.61.0", - "@typescript-eslint/types": "8.61.0", - "@typescript-eslint/typescript-estree": "8.61.0", - "@typescript-eslint/visitor-keys": "8.61.0", + "@typescript-eslint/scope-manager": "8.61.1", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1", "debug": "^4.4.3" }, "engines": { @@ -6123,14 +6123,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.61.0.tgz", - "integrity": "sha512-DV42F7MLJO6Rax7SK1yg43tcnEfGUrurSpSxKuVX+a3RCTzBlH3fuxprrOJXKCJGAaw82xXocikJ0uQaqwXgGA==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.61.1.tgz", + "integrity": "sha512-PrC4JYGmR241lYnfhmKGTXkFqv8+ymbTFgSAY0fVXpY82/QkMw5TZPl+vGzuDDU2QYJk9fIDOBTntF+yDv9LEA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.61.0", - "@typescript-eslint/types": "^8.61.0", + "@typescript-eslint/tsconfig-utils": "^8.61.1", + "@typescript-eslint/types": "^8.61.1", "debug": "^4.4.3" }, "engines": { @@ -6145,14 +6145,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.61.0.tgz", - "integrity": "sha512-IWdXFHFSb6mlC3HPc7QsLDm5zYEbUla6trDEHf32D3/dnuUyXd87plScSNXSbm0/RxMvObpI17sv/EDTGrGZkA==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.61.1.tgz", + "integrity": "sha512-L2bdIeoQS8FlKAvONAr20w6OcLXeB+qiDKbAooS9A0Ben+iSIkBef0FxqwKWYqt5sa0i4KJtxVyVmhMylKzF5w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.61.0", - "@typescript-eslint/visitor-keys": "8.61.0" + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6163,9 +6163,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.0.tgz", - "integrity": "sha512-O5Amvdv9ztMpxpf+vmFULGG78IE6Qwdr3bCGvqwG4nwc9H2qXkOYJJnRbRHyMkQTjv1d03olqwwwzHLMqpFePQ==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.1.tgz", + "integrity": "sha512-UN/H4di+OO7EWx2ovME+8t31YO+KVnK0RRKEHR3kOt21/Ay8BOq3M1OMvWs5vNiqcFCYGYoxK3MXPZzmMUE+yg==", "dev": true, "license": "MIT", "engines": { @@ -6180,15 +6180,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.61.0.tgz", - "integrity": "sha512-TuBiQYIkd97yBfInHCTKVYMbX4kvEmpOEuixIuzCU9p8BGT1SfyyO0d0IfDMbPIHcjn/hWnusUX5e8v5Xg+X8A==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.61.1.tgz", + "integrity": "sha512-GYRicKmVK0C4fsKgaACaknOUAq9Oa2kwsjnpFhFcS/5p4Ht5IP9OVLbgIgcK4SRk92nVHFluurg1lumD9dBcLw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.61.0", - "@typescript-eslint/typescript-estree": "8.61.0", - "@typescript-eslint/utils": "8.61.0", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1", + "@typescript-eslint/utils": "8.61.1", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -6205,9 +6205,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.61.0.tgz", - "integrity": "sha512-9QTQpZ5Iin4CdIodfbDQFSeiSJKidgYJYug1P9CC2xWgUTvlmixViqDZNciMjwLBZyJnG4tGmPl97rVAFb1AJg==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.61.1.tgz", + "integrity": "sha512-G+CRlPqLv7Bz1IZVs03x5K59F1veqL0EJUROAdGhKsEq8qOiRiZbI+HUojPq5l0fEGOKModD9br6lObhB8zkoA==", "dev": true, "license": "MIT", "engines": { @@ -6219,16 +6219,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.61.0.tgz", - "integrity": "sha512-42zatd5qSvvcV1JdDBCLxYRznvP4eIHpPoZXdkPFnAmanA4FuZ5dibSnCBggY8hQnqajPpoGjXFdZ7fIJKQnlA==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.61.1.tgz", + "integrity": "sha512-u+oQD3BqYWPc8YV9Zab4vaJElJuwOLPRc10Jm1o/qS+6Qwen14HCWwx0Seo4LnSn2wxea2Ik8DxPt2/FHmuhrg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.61.0", - "@typescript-eslint/tsconfig-utils": "8.61.0", - "@typescript-eslint/types": "8.61.0", - "@typescript-eslint/visitor-keys": "8.61.0", + "@typescript-eslint/project-service": "8.61.1", + "@typescript-eslint/tsconfig-utils": "8.61.1", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -6247,16 +6247,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.61.0.tgz", - "integrity": "sha512-3bzFt7ImFMW/jVYwJamDoe/dMOdFLSC6pom6rRjdh4SZJEYupyMzem8e7vKZLclLfpHjlwSAXOUxtKxGXUiLqA==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.61.1.tgz", + "integrity": "sha512-1+P/3Dj6jvtybE1q0HQ6yBt/gq+oKJyLdEv4HdnqasaEXRSYCAsD59mXEVQnM/ULNdQxbX77tdG4jPRjIS6knA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.61.0", - "@typescript-eslint/types": "8.61.0", - "@typescript-eslint/typescript-estree": "8.61.0" + "@typescript-eslint/scope-manager": "8.61.1", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6271,13 +6271,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.61.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.0.tgz", - "integrity": "sha512-QVLZu3ZPQEE+HICQyAMZ2yLQhxf0meY/wx6Hx14YcTNj13JB3qHlX3lJ02L3fLGHgERRH71kvYDwiXIguT3AjQ==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.1.tgz", + "integrity": "sha512-6fJ9MHWtK14C1DSkiMlHUSOmrVebL7150xZJBlJiL62jjhIA4JmOq6flwBgDxIdBKKdoiZRel+dfPD5MLfny3w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.61.0", + "@typescript-eslint/types": "8.61.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -14310,16 +14310,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.61.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.61.0.tgz", - "integrity": "sha512-8y31Rd0eGTrDKqhy6vT0HtzhN+YLjQizwX3aA3hPXP/ynSfnrBXcQY5IzsP9/DM7+klX4IUncZZjkchP0z+rUw==", + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.61.1.tgz", + "integrity": "sha512-V7PayAfJokV3pEHgN7/v03D1SpujhRfQtYLbLIiBfDDncdg4PAiRBfoS4cnCANK4jmAPncczi59QO3afiXUlNw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.61.0", - "@typescript-eslint/parser": "8.61.0", - "@typescript-eslint/typescript-estree": "8.61.0", - "@typescript-eslint/utils": "8.61.0" + "@typescript-eslint/eslint-plugin": "8.61.1", + "@typescript-eslint/parser": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1", + "@typescript-eslint/utils": "8.61.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" diff --git a/client/package.json b/client/package.json index ff52732cf2..c765a11cbf 100644 --- a/client/package.json +++ b/client/package.json @@ -140,7 +140,7 @@ "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.61.0" + "typescript-eslint": "^8.61.1" }, "browser": { "fs": false From e2e214ad68b7c9417ceeb5275da1afe685fea25d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 09:03:25 +0200 Subject: [PATCH 06/71] Bump the angular group in /client with 2 updates (#6317) --- client/package-lock.json | 310 ++++++++++++++++----------------------- client/package.json | 4 +- 2 files changed, 127 insertions(+), 187 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 61780c7dab..79c7709e29 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -80,8 +80,8 @@ "@angular-eslint/eslint-plugin-template": "^21.4.0", "@angular-eslint/schematics": "^21.4.0", "@angular-eslint/template-parser": "^21.3.0", - "@angular/build": "^21.2.15", - "@angular/cli": "^21.2.15", + "@angular/build": "^21.2.16", + "@angular/cli": "^21.2.16", "@angular/compiler-cli": "^21.2.17", "@angular/language-server": "^21.2.17", "@coreui/angular-chartjs": "^5.6.24", @@ -362,13 +362,13 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.2102.15", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2102.15.tgz", - "integrity": "sha512-EZQXu6j7J7OUxmpxIO2mxd58NTlCb7HOAOfLLGdk7lRcwZeCxnjGRzb72tXlJgIEi3IoOYwcW0ft2cg7r/d6qA==", + "version": "0.2102.16", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2102.16.tgz", + "integrity": "sha512-FDUKPpq70nJwGK4CICPD31XmesBEGv57Z+JBCPWrTa5mVZIXCQkeo5waIaNfzAnLdbpd74ULJJ3MDNVt4iaGZg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "21.2.15", + "@angular-devkit/core": "21.2.16", "rxjs": "7.8.2" }, "bin": { @@ -381,9 +381,9 @@ } }, "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": { - "version": "21.2.15", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.15.tgz", - "integrity": "sha512-x7EwuQtMGHANVznHpwyEi/3lMo/kRoaxV2w7lXbRGjTezwv4SPaOBwhrIGCbAVFs5B1ziff4jZzors4owlCTgg==", + "version": "21.2.16", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.16.tgz", + "integrity": "sha512-bRot0dqonxdSuGzXyOYtVJis/u9CJycrfC/aaxLeMF37gKtWIyCR2KFkMRXAoiV/AKk5/NuuqDNqcQS9w5G3Fg==", "dev": true, "license": "MIT", "dependencies": { @@ -409,13 +409,13 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "21.2.15", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-21.2.15.tgz", - "integrity": "sha512-kHHV694KUPuXlItjvnxUspn+KYjlTKu8KINX/kT1qlogzLYojpnRwcUtZyRPUz1f/M1d3TUHVFeBKx+h5HoNcA==", + "version": "21.2.16", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-21.2.16.tgz", + "integrity": "sha512-3wTn2N6iWxYLrRaFDk3J3a6P3OxL+yvYGoDA7pNKfI+Nu0PpTK8BBwhNQD8L5P3US/QGWTkMNbzZ7XxBBfFP/g==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "21.2.15", + "@angular-devkit/core": "21.2.16", "jsonc-parser": "3.3.1", "magic-string": "0.30.21", "ora": "9.3.0", @@ -428,9 +428,9 @@ } }, "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": { - "version": "21.2.15", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.15.tgz", - "integrity": "sha512-x7EwuQtMGHANVznHpwyEi/3lMo/kRoaxV2w7lXbRGjTezwv4SPaOBwhrIGCbAVFs5B1ziff4jZzors4owlCTgg==", + "version": "21.2.16", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.16.tgz", + "integrity": "sha512-bRot0dqonxdSuGzXyOYtVJis/u9CJycrfC/aaxLeMF37gKtWIyCR2KFkMRXAoiV/AKk5/NuuqDNqcQS9w5G3Fg==", "dev": true, "license": "MIT", "dependencies": { @@ -685,14 +685,14 @@ } }, "node_modules/@angular/build": { - "version": "21.2.15", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-21.2.15.tgz", - "integrity": "sha512-APJ5v0/hL38CKSqSQDos5Y8/O2LSiSSqP9FagdcMT5j9JAlENXdhVaA3IxPMXDWcxtzD5T1IlN8Z9aFxDXxHyg==", + "version": "21.2.16", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-21.2.16.tgz", + "integrity": "sha512-40Ra2lM/KDPwA68wP6ZX7zVQak/ouo1sTmtUmjUpqihDp5ftXAZWD3t2Mm4Ja88cyHzG3kaI3C0ew/wAdcEeDA==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.2102.15", + "@angular-devkit/architect": "0.2102.16", "@babel/core": "7.29.0", "@babel/helper-annotate-as-pure": "7.27.3", "@babel/helper-split-export-declaration": "7.24.7", @@ -735,7 +735,7 @@ "@angular/platform-browser": "^21.0.0", "@angular/platform-server": "^21.0.0", "@angular/service-worker": "^21.0.0", - "@angular/ssr": "^21.2.15", + "@angular/ssr": "^21.2.16", "karma": "^6.4.0", "less": "^4.2.0", "ng-packagr": "^21.0.0", @@ -801,26 +801,26 @@ } }, "node_modules/@angular/cli": { - "version": "21.2.15", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-21.2.15.tgz", - "integrity": "sha512-8CT1iST5CwdxHEzC0NVFUsMenAY7aE30ayTAw5PpA6MPs6bdHlL6QxTmkqThW7hoCj6PJ56YfQMzSQU+aYRLQA==", + "version": "21.2.16", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-21.2.16.tgz", + "integrity": "sha512-/O2Bsy4jae/op06ejyfsL6K4cD4yo7TEH9iesD4UPEvcWTnV8lCdmE2oxbc1WGT3DIsZ00yBQhURSbetDPGFCg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.2102.15", - "@angular-devkit/core": "21.2.15", - "@angular-devkit/schematics": "21.2.15", + "@angular-devkit/architect": "0.2102.16", + "@angular-devkit/core": "21.2.16", + "@angular-devkit/schematics": "21.2.16", "@inquirer/prompts": "7.10.1", "@listr2/prompt-adapter-inquirer": "3.0.5", "@modelcontextprotocol/sdk": "1.26.0", - "@schematics/angular": "21.2.15", + "@schematics/angular": "21.2.16", "@yarnpkg/lockfile": "1.1.0", "algoliasearch": "5.48.1", "ini": "6.0.0", "jsonc-parser": "3.3.1", "listr2": "9.0.5", "npm-package-arg": "13.0.2", - "pacote": "21.3.1", + "pacote": "21.5.1", "parse5-html-rewriting-stream": "8.0.0", "semver": "7.7.4", "yargs": "18.0.0", @@ -836,9 +836,9 @@ } }, "node_modules/@angular/cli/node_modules/@angular-devkit/core": { - "version": "21.2.15", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.15.tgz", - "integrity": "sha512-x7EwuQtMGHANVznHpwyEi/3lMo/kRoaxV2w7lXbRGjTezwv4SPaOBwhrIGCbAVFs5B1ziff4jZzors4owlCTgg==", + "version": "21.2.16", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.16.tgz", + "integrity": "sha512-bRot0dqonxdSuGzXyOYtVJis/u9CJycrfC/aaxLeMF37gKtWIyCR2KFkMRXAoiV/AKk5/NuuqDNqcQS9w5G3Fg==", "dev": true, "license": "MIT", "dependencies": { @@ -2278,14 +2278,11 @@ "license": "MIT" }, "node_modules/@gar/promise-retry": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@gar/promise-retry/-/promise-retry-1.0.2.tgz", - "integrity": "sha512-Lm/ZLhDZcBECta3TmCQSngiQykFdfw+QtI1/GYMsZd4l3nG+P8WLB16XuS7WaBGLQ+9E+cOcWQsth9cayuGt8g==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@gar/promise-retry/-/promise-retry-1.0.3.tgz", + "integrity": "sha512-GmzA9ckNokPypTg10pgpeHNQe7ph+iIKKmhKu3Ob9ANkswreCx7R3cKmY781K8QK3AqVL3xVh9A42JvIAbkkSA==", "dev": true, "license": "MIT", - "dependencies": { - "retry": "^0.13.1" - }, "engines": { "node": "^20.17.0 || >=22.9.0" } @@ -3545,9 +3542,9 @@ } }, "node_modules/@npmcli/agent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.0.tgz", - "integrity": "sha512-kAQTcEN9E8ERLVg5AsGwLNoFb+oEG6engbqAU2P43gD4JEIkNGMHdVQ096FsOAAYpZPB0RSt0zgInKIAS1l5QA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.2.tgz", + "integrity": "sha512-EUEuWAxnL07Sp5/iC/1X6Xj+XThUvnbei9zfRWZdEXa7lss9RTHMhAHBeg+MZ5To9s/gGaSI+UwZTPdYMvKSeg==", "dev": true, "license": "ISC", "dependencies": { @@ -3562,9 +3559,9 @@ } }, "node_modules/@npmcli/agent/node_modules/lru-cache": { - "version": "11.2.6", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz", - "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==", + "version": "11.5.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz", + "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==", "dev": true, "license": "BlueOak-1.0.0", "engines": { @@ -3615,9 +3612,9 @@ } }, "node_modules/@npmcli/git/node_modules/lru-cache": { - "version": "11.2.6", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz", - "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==", + "version": "11.5.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz", + "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==", "dev": true, "license": "BlueOak-1.0.0", "engines": { @@ -4719,14 +4716,14 @@ ] }, "node_modules/@schematics/angular": { - "version": "21.2.15", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-21.2.15.tgz", - "integrity": "sha512-xdTirIUUegMXtyEDsYabCRcAnlVatVYb6S8v77fgK2eqUhGalI2e/3+L51N3XF1+6K2vEhyDpmmhFZLsdhLYbw==", + "version": "21.2.16", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-21.2.16.tgz", + "integrity": "sha512-ctvsRartACu77VAM416VlNV3mag7FhU08I/734f4+sS/UZmnhuTM5a4tTTWEI1U7iPeJoBtjreh6LgeP+QZLbQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "21.2.15", - "@angular-devkit/schematics": "21.2.15", + "@angular-devkit/core": "21.2.16", + "@angular-devkit/schematics": "21.2.16", "jsonc-parser": "3.3.1" }, "engines": { @@ -4736,9 +4733,9 @@ } }, "node_modules/@schematics/angular/node_modules/@angular-devkit/core": { - "version": "21.2.15", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.15.tgz", - "integrity": "sha512-x7EwuQtMGHANVznHpwyEi/3lMo/kRoaxV2w7lXbRGjTezwv4SPaOBwhrIGCbAVFs5B1ziff4jZzors4owlCTgg==", + "version": "21.2.16", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.16.tgz", + "integrity": "sha512-bRot0dqonxdSuGzXyOYtVJis/u9CJycrfC/aaxLeMF37gKtWIyCR2KFkMRXAoiV/AKk5/NuuqDNqcQS9w5G3Fg==", "dev": true, "license": "MIT", "dependencies": { @@ -4777,9 +4774,9 @@ } }, "node_modules/@sigstore/core": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-3.1.0.tgz", - "integrity": "sha512-o5cw1QYhNQ9IroioJxpzexmPjfCe7gzafd2RY3qnMpxr4ZEja+Jad/U8sgFpaue6bOaF+z7RVkyKVV44FN+N8A==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-3.2.1.tgz", + "integrity": "sha512-qRsxPnCrbC/puegGxKuynfnxgLiHqWStrSjxkoB4YKqq3Z3s4cyZyj42ZdWFAEblNP65C+rBH8EuREHIXoi83g==", "dev": true, "license": "Apache-2.0", "engines": { @@ -4787,9 +4784,9 @@ } }, "node_modules/@sigstore/protobuf-specs": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.5.0.tgz", - "integrity": "sha512-MM8XIwUjN2bwvCg1QvrMtbBmpcSHrkhFSCu1D11NyPvDQ25HEc4oG5/OcQfd/Tlf/OxmKWERDj0zGE23jQaMwA==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.5.1.tgz", + "integrity": "sha512-/ScWUhhoFasJsSRGTVBwId1loQjjnjAfE4djL6ZhrXRpNCmPTnUKF5Jokd58ILseOMjzET3UrMOtJPS9sYeI0g==", "dev": true, "license": "Apache-2.0", "engines": { @@ -4797,27 +4794,27 @@ } }, "node_modules/@sigstore/sign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-4.1.0.tgz", - "integrity": "sha512-Vx1RmLxLGnSUqx/o5/VsCjkuN5L7y+vxEEwawvc7u+6WtX2W4GNa7b9HEjmcRWohw/d6BpATXmvOwc78m+Swdg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-4.1.1.tgz", + "integrity": "sha512-Hf4xglukg0XXQ2RiD5vSoLjdPe8OBUPA8XeVjUObheuDcWdYWrnH/BNmxZCzkAy68MzmNCxXLeurJvs6hcP2OQ==", "dev": true, "license": "Apache-2.0", "dependencies": { + "@gar/promise-retry": "^1.0.2", "@sigstore/bundle": "^4.0.0", - "@sigstore/core": "^3.1.0", + "@sigstore/core": "^3.2.0", "@sigstore/protobuf-specs": "^0.5.0", - "make-fetch-happen": "^15.0.3", - "proc-log": "^6.1.0", - "promise-retry": "^2.0.1" + "make-fetch-happen": "^15.0.4", + "proc-log": "^6.1.0" }, "engines": { "node": "^20.17.0 || >=22.9.0" } }, "node_modules/@sigstore/tuf": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-4.0.1.tgz", - "integrity": "sha512-OPZBg8y5Vc9yZjmWCHrlWPMBqW5yd8+wFNl+thMdtcWz3vjVSoJQutF8YkrzI0SLGnkuFof4HSsWUhXrf219Lw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-4.0.2.tgz", + "integrity": "sha512-TCAzTy0xzdP79EnxSjq9KQ3eaR7+FmudLC6eRKknVKZbV7ZNlGLClAAQb/HMNJ5n2OBNk2GT1tEmU0xuPr+SLQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -4829,14 +4826,14 @@ } }, "node_modules/@sigstore/verify": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-3.1.0.tgz", - "integrity": "sha512-mNe0Iigql08YupSOGv197YdHpPPr+EzDZmfCgMc7RPNaZTw5aLN01nBl6CHJOh3BGtnMIj83EeN4butBchc8Ag==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-3.1.1.tgz", + "integrity": "sha512-qv7+G3J2cc6wwFj3yKvXOamzqhMwSk1ogPGmhpS8iXllcPrJaIIBA+4HbttlHVu1pqWTdmaCH/WE7UOC51kdoA==", "dev": true, "license": "Apache-2.0", "dependencies": { "@sigstore/bundle": "^4.0.0", - "@sigstore/core": "^3.1.0", + "@sigstore/core": "^3.2.1", "@sigstore/protobuf-specs": "^0.5.0" }, "engines": { @@ -7145,9 +7142,9 @@ } }, "node_modules/cacache": { - "version": "20.0.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-20.0.3.tgz", - "integrity": "sha512-3pUp4e8hv07k1QlijZu6Kn7c9+ZpWWk4j3F8N3xPuCExULobqJydKYOTj1FTq58srkJsXvO7LbGAH4C0ZU3WGw==", + "version": "20.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-20.0.4.tgz", + "integrity": "sha512-M3Lab8NPYlZU2exsL3bMVvMrMqgwCnMWfdZbK28bn3pK6APT/Te/I8hjRPNu1uwORY9a1eEQoifXbKPQMfMTOA==", "dev": true, "license": "ISC", "dependencies": { @@ -7160,17 +7157,16 @@ "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", "p-map": "^7.0.2", - "ssri": "^13.0.0", - "unique-filename": "^5.0.0" + "ssri": "^13.0.0" }, "engines": { "node": "^20.17.0 || >=22.9.0" } }, "node_modules/cacache/node_modules/lru-cache": { - "version": "11.2.6", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz", - "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==", + "version": "11.5.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz", + "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==", "dev": true, "license": "BlueOak-1.0.0", "engines": { @@ -8195,13 +8191,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true, - "license": "MIT" - }, "node_modules/es-define-property": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", @@ -9557,9 +9546,9 @@ } }, "node_modules/hosted-git-info": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-9.0.2.tgz", - "integrity": "sha512-M422h7o/BR3rmCQ8UHi7cyyMqKltdP9Uo+J2fXK+RSAY+wTcKOIRyhTuKv4qn+DJf3g+PL890AzId5KZpX+CBg==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-9.0.3.tgz", + "integrity": "sha512-Hc+ghLoSt6QaYZUv0WBiIvmMDZuZZ7oaDvdH8MbfOO4lOsxdXLEvuC6ePoGs9H1X9oCLyq6+NVN0MKqD+ydxyg==", "dev": true, "license": "ISC", "dependencies": { @@ -9570,9 +9559,9 @@ } }, "node_modules/hosted-git-info/node_modules/lru-cache": { - "version": "11.2.6", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz", - "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==", + "version": "11.5.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz", + "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==", "dev": true, "license": "BlueOak-1.0.0", "engines": { @@ -11184,14 +11173,15 @@ "license": "ISC" }, "node_modules/make-fetch-happen": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.4.tgz", - "integrity": "sha512-vM2sG+wbVeVGYcCm16mM3d5fuem9oC28n436HjsGO3LcxoTI8LNVa4rwZDn3f76+cWyT4GGJDxjTYU1I2nr6zw==", + "version": "15.0.6", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.6.tgz", + "integrity": "sha512-Je0fLJ0F5atA7F+eIlLzk+Wkcl57JDf4kf+EW8xiP5E31xOQxkIxTbgf1Oi1Lw9tRI9UEMRdI5Vz2xTzoNU1Jw==", "dev": true, "license": "ISC", "dependencies": { "@gar/promise-retry": "^1.0.0", "@npmcli/agent": "^4.0.0", + "@npmcli/redact": "^4.0.0", "cacache": "^20.0.1", "http-cache-semantics": "^4.1.1", "minipass": "^7.0.2", @@ -11411,11 +11401,11 @@ } }, "node_modules/minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.7.tgz", + "integrity": "sha512-TbqTz9cUwWyHS2Dy89P3ocAGUGxKjjLuR9z8w4WUTGAVgEj17/4nhgo2Du56i0Fm3Pm30g4iA8Lcqctc76jCzA==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "dependencies": { "minipass": "^3.0.0" }, @@ -11732,21 +11722,21 @@ "optional": true }, "node_modules/node-gyp": { - "version": "12.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.2.0.tgz", - "integrity": "sha512-q23WdzrQv48KozXlr0U1v9dwO/k59NHeSzn6loGcasyf0UnSrtzs8kRxM+mfwJSf0DkX0s43hcqgnSO4/VNthQ==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.4.0.tgz", + "integrity": "sha512-OMcPNvqTCFUnNaBlmdgq+lfNqY7gTiSmNRDjY3uAXRyudeKZEZxu3CLtjMQrx4zZxCX2b/mpNqTtwuCJgXhHkw==", "dev": true, "license": "MIT", "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", "graceful-fs": "^4.2.6", - "make-fetch-happen": "^15.0.0", "nopt": "^9.0.0", "proc-log": "^6.0.0", "semver": "^7.3.5", "tar": "^7.5.4", "tinyglobby": "^0.2.12", + "undici": "^6.25.0", "which": "^6.0.0" }, "bin": { @@ -11782,6 +11772,16 @@ "node": ">=20" } }, + "node_modules/node-gyp/node_modules/undici": { + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.27.0.tgz", + "integrity": "sha512-YmfV3YnEDzXRC5lZ2jWtWWHKGUm1zIt8AhesR1tens+HTNv+YZlN/dp6G727LOvMJ8xjP9Be7Y2Sdr96LDm+pg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18.17" + } + }, "node_modules/node-gyp/node_modules/which": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz", @@ -12155,12 +12155,13 @@ } }, "node_modules/pacote": { - "version": "21.3.1", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-21.3.1.tgz", - "integrity": "sha512-O0EDXi85LF4AzdjG74GUwEArhdvawi/YOHcsW6IijKNj7wm8IvEWNF5GnfuxNpQ/ZpO3L37+v8hqdVh8GgWYhg==", + "version": "21.5.1", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-21.5.1.tgz", + "integrity": "sha512-KvcJ9iy3crysCsgqc4+PknH/w6jkrp8JN36mpZBPwNaDRwTfMZD37YzRazNstiZUOhuF5pno9f78n9mEJBavwg==", "dev": true, "license": "ISC", "dependencies": { + "@gar/promise-retry": "^1.0.0", "@npmcli/git": "^7.0.0", "@npmcli/installed-package-contents": "^4.0.0", "@npmcli/package-json": "^7.0.0", @@ -12174,7 +12175,6 @@ "npm-pick-manifest": "^11.0.1", "npm-registry-fetch": "^19.0.0", "proc-log": "^6.0.0", - "promise-retry": "^2.0.1", "sigstore": "^4.0.0", "ssri": "^13.0.0", "tar": "^7.4.3" @@ -12592,30 +12592,6 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "license": "MIT" }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/promise-retry/node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "node_modules/prosemirror-changeset": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.3.0.tgz", @@ -13130,16 +13106,6 @@ "integrity": "sha512-gSfoiOEA0VPE6Tukkrr7I0RBdE0s7H1eFCDBk05l1KIQT1UIKNc5JZy6jdyW6eYH3aR3g5b3PuL77rq0hvwtAw==", "license": "MIT" }, - "node_modules/retry": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", - "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, "node_modules/rfdc": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", @@ -13652,18 +13618,18 @@ } }, "node_modules/sigstore": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-4.1.0.tgz", - "integrity": "sha512-/fUgUhYghuLzVT/gaJoeVehLCgZiUxPCPMcyVNY0lIf/cTCz58K/WTI7PefDarXxp9nUKpEwg1yyz3eSBMTtgA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-4.1.1.tgz", + "integrity": "sha512-endqECJkfhozrXMK5ngu/UAA0xVcVEFdnHJCElGaExypjW+HK5i6zu3NteLoaX/iFbRUbC3+DjttQs0GARr+5w==", "dev": true, "license": "Apache-2.0", "dependencies": { "@sigstore/bundle": "^4.0.0", - "@sigstore/core": "^3.1.0", + "@sigstore/core": "^3.2.1", "@sigstore/protobuf-specs": "^0.5.0", - "@sigstore/sign": "^4.1.0", - "@sigstore/tuf": "^4.0.1", - "@sigstore/verify": "^3.1.0" + "@sigstore/sign": "^4.1.1", + "@sigstore/tuf": "^4.0.2", + "@sigstore/verify": "^3.1.1" }, "engines": { "node": "^20.17.0 || >=22.9.0" @@ -13818,13 +13784,13 @@ } }, "node_modules/socks": { - "version": "2.8.7", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", - "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==", + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.9.tgz", + "integrity": "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==", "dev": true, "license": "MIT", "dependencies": { - "ip-address": "^10.0.1", + "ip-address": "^10.1.1", "smart-buffer": "^4.2.0" }, "engines": { @@ -14042,9 +14008,9 @@ } }, "node_modules/tar": { - "version": "7.5.11", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz", - "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==", + "version": "7.5.16", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.16.tgz", + "integrity": "sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -14403,32 +14369,6 @@ "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==", "license": "MIT" }, - "node_modules/unique-filename": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-5.0.0.tgz", - "integrity": "sha512-2RaJTAvAb4owyjllTfXzFClJ7WsGxlykkPvCr9pA//LD9goVq+m4PPAeBgNodGZ7nSrntT/auWpJ6Y5IFXcfjg==", - "dev": true, - "license": "ISC", - "dependencies": { - "unique-slug": "^6.0.0" - }, - "engines": { - "node": "^20.17.0 || >=22.9.0" - } - }, - "node_modules/unique-slug": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-6.0.0.tgz", - "integrity": "sha512-4Lup7Ezn8W3d52/xBhZBVdx323ckxa7DEvd9kPQHppTkLoJXw6ltrBCyj5pnrxj0qKDxYMJ56CoxNuFCscdTiw==", - "dev": true, - "license": "ISC", - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^20.17.0 || >=22.9.0" - } - }, "node_modules/universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", diff --git a/client/package.json b/client/package.json index c765a11cbf..1cc8a10dc4 100644 --- a/client/package.json +++ b/client/package.json @@ -103,8 +103,8 @@ "@angular-eslint/eslint-plugin-template": "^21.4.0", "@angular-eslint/schematics": "^21.4.0", "@angular-eslint/template-parser": "^21.3.0", - "@angular/build": "^21.2.15", - "@angular/cli": "^21.2.15", + "@angular/build": "^21.2.16", + "@angular/cli": "^21.2.16", "@angular/compiler-cli": "^21.2.17", "@angular/language-server": "^21.2.17", "@coreui/angular-chartjs": "^5.6.24", From 9120c512ac51571956f79528ede617e79cdcd2e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 09:04:21 +0200 Subject: [PATCH 07/71] Bump cm-chessboard from 8.12.11 to 8.12.12 in /client in the chess group (#6319) --- client/package-lock.json | 8 ++++---- client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 79c7709e29..e64ed1df74 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -52,7 +52,7 @@ "@tsparticles/slim": "^3.9.1", "chart.js": "^4.5.1", "cm-chess": "^3.6.3", - "cm-chessboard": "^8.12.11", + "cm-chessboard": "^8.12.12", "date-fns": "^4.4.0", "exceljs": "^4.4.0", "file-saver": "^2.0.5", @@ -7488,9 +7488,9 @@ } }, "node_modules/cm-chessboard": { - "version": "8.12.11", - "resolved": "https://registry.npmjs.org/cm-chessboard/-/cm-chessboard-8.12.11.tgz", - "integrity": "sha512-emtTghrWGvSuLsbn3su1aazwgHVy2AA29ZzQ+sRdxOnbQuhdAmY1S70QmahLW+zbUt+YSOqNtFGIBnOp//9ZWg==", + "version": "8.12.12", + "resolved": "https://registry.npmjs.org/cm-chessboard/-/cm-chessboard-8.12.12.tgz", + "integrity": "sha512-AQ68/xn5FpIBTI7ySLQ0S/bKbzPRFZTCgNs8gG8fuxvg3DQ+R3kVUX7hWQUm1KrVyUoPuxTx1BuAqhVJoDtvoQ==", "license": "MIT" }, "node_modules/cm-pgn": { diff --git a/client/package.json b/client/package.json index 1cc8a10dc4..753f865a34 100644 --- a/client/package.json +++ b/client/package.json @@ -75,7 +75,7 @@ "@tsparticles/slim": "^3.9.1", "chart.js": "^4.5.1", "cm-chess": "^3.6.3", - "cm-chessboard": "^8.12.11", + "cm-chessboard": "^8.12.12", "date-fns": "^4.4.0", "exceljs": "^4.4.0", "file-saver": "^2.0.5", From 096618ed433215350c9e5f669d9d4120d8f5930b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 09:06:44 +0200 Subject: [PATCH 08/71] Bump actions/checkout from 6 to 7 (#6315) --- .github/workflows/ci-package-motion-diff.yml | 2 +- .github/workflows/continuous-integration.yml | 6 +++--- .github/workflows/pick-to-staging.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-package-motion-diff.yml b/.github/workflows/ci-package-motion-diff.yml index 58fbe36316..fcf090e5ac 100644 --- a/.github/workflows/ci-package-motion-diff.yml +++ b/.github/workflows/ci-package-motion-diff.yml @@ -17,7 +17,7 @@ jobs: name: build-and-test-package-motion-diff runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: 'Install Node' uses: actions/setup-node@v6 diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a4796ae9c6..995ad28afc 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone main repo - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: repository: OpenSlides/OpenSlides path: "." @@ -33,7 +33,7 @@ jobs: run: rm -r openslides-client - name: Clone openslides-client - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: path: "./openslides-client" @@ -101,7 +101,7 @@ jobs: name: build-and-test-dev-image runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 with: submodules: "recursive" diff --git a/.github/workflows/pick-to-staging.yml b/.github/workflows/pick-to-staging.yml index b8226dabc3..9580c2deb1 100644 --- a/.github/workflows/pick-to-staging.yml +++ b/.github/workflows/pick-to-staging.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout main - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: ref: main fetch-depth: 2 From e6562b281a74f7dc3dc800a1491628e48a5f531f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 09:07:49 +0200 Subject: [PATCH 09/71] Bump undici from 7.25.0 to 7.28.0 in /packages/openslides-motion-diff (#6312) --- packages/openslides-motion-diff/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/openslides-motion-diff/package-lock.json b/packages/openslides-motion-diff/package-lock.json index 61d605e807..9bd1479a1e 100644 --- a/packages/openslides-motion-diff/package-lock.json +++ b/packages/openslides-motion-diff/package-lock.json @@ -2662,9 +2662,9 @@ "license": "MIT" }, "node_modules/undici": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.25.0.tgz", - "integrity": "sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.28.0.tgz", + "integrity": "sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==", "dev": true, "license": "MIT", "engines": { From a97afa3fd78450256e0bd44b6b434fd899741a8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 09:07:58 +0200 Subject: [PATCH 10/71] Bump hono from 4.12.23 to 4.12.26 in /client (#6311) --- client/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index e64ed1df74..f331aac278 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -9536,9 +9536,9 @@ } }, "node_modules/hono": { - "version": "4.12.23", - "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.23.tgz", - "integrity": "sha512-eIaZ9qDgu7XV0pxOCrg7/WhnQ6Ivm22UcxhXx/A3dcbqbbYgBEkc6e/J/s7j2tS96zoB0S9VBdLwQNCWwUo4LA==", + "version": "4.12.26", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.26.tgz", + "integrity": "sha512-uyZtpnYxM9CmQ7QsQknM4zN8EftNqhON1qYeIKM0Se67CCEe2c44xyGURwB0axX2fBDu1dqHrHAc1hmNT8ITkw==", "dev": true, "license": "MIT", "engines": { From b91d829a53e2fac1e86a6a66f3e18519b62c06c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 09:32:40 +0200 Subject: [PATCH 11/71] Bump the typescript-eslint group across 1 directory with 2 updates (#6314) --- client/package-lock.json | 563 +++++++++++++++++++++++++++++++++++++-- client/package.json | 4 +- 2 files changed, 542 insertions(+), 25 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index f331aac278..ffee8da5ce 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -94,8 +94,8 @@ "@types/qrcode": "^1.5.6", "@types/tinycolor2": "^1.4.6", "@types/video.js": "^7.3.58", - "@typescript-eslint/eslint-plugin": "^8.61.0", - "@typescript-eslint/parser": "^8.61.0", + "@typescript-eslint/eslint-plugin": "^8.62.0", + "@typescript-eslint/parser": "^8.62.0", "@vendure/ngx-translate-extract": "^10.1.3", "angular-eslint": "^21.4.0", "eslint": "^9.39.4", @@ -6066,17 +6066,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.1.tgz", - "integrity": "sha512-ZPlVl3PB3et/59Ne0fv/sci6ZXz4T4Hp4nTJ56i/Y0gR89ARb+KphojTq6j+56E5PIezmOIOOWyY+aWQFd+IkQ==", + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.62.0.tgz", + "integrity": "sha512-o+mpz7EYiMzXoySXiKmzlabIvTVqUuK5yLrAedRPRDA0IpPFMUV1IXt6OqljIxX/kumN6EjUYp41Hqelh6p/Dw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.61.1", - "@typescript-eslint/type-utils": "8.61.1", - "@typescript-eslint/utils": "8.61.1", - "@typescript-eslint/visitor-keys": "8.61.1", + "@typescript-eslint/scope-manager": "8.62.0", + "@typescript-eslint/type-utils": "8.62.0", + "@typescript-eslint/utils": "8.62.0", + "@typescript-eslint/visitor-keys": "8.62.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -6089,22 +6089,176 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.61.1", + "@typescript-eslint/parser": "^8.62.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/project-service": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.0.tgz", + "integrity": "sha512-wexnCqiTg7BOGtbLDftYpRWlmLq4xfoMd7BKFR6Y75sZS3QmRKLdN3yWLhmIYgqMmP/OXWpj3H8odkb5nGURCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/tsconfig-utils": "^8.62.0", + "@typescript-eslint/types": "^8.62.0", + "debug": "^4.4.3" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.0.tgz", + "integrity": "sha512-1lX38kNxXIRb8mEc3lbq5mdHq1Pf2+U0nFU65KfT18mtPxxl0fvjuEE92mHuXPuCtElJhOrddOpyMlM3Z0umEA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.62.0", + "@typescript-eslint/visitor-keys": "8.62.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.0.tgz", + "integrity": "sha512-y2GAdB6ykaXUvuspbYnizQc4oDDz0Tz/Yc7iWrXf9mx8vm/L/0vLHCe0tS2boG96Zy+DivnVDQ9ZUEWoHqqx1g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz", + "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.0.tgz", + "integrity": "sha512-+hVbNxtW64pIcZWDPGbyaKF7vp2IBTVY5ma1blwwksrjdsbdqqEKvJWMGbBofei4F6Dovx1M0RJgoFeNu2279A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/project-service": "8.62.0", + "@typescript-eslint/tsconfig-utils": "8.62.0", + "@typescript-eslint/types": "8.62.0", + "@typescript-eslint/visitor-keys": "8.62.0", + "debug": "^4.4.3", + "minimatch": "^10.2.2", + "semver": "^7.7.3", + "tinyglobby": "^0.2.15", + "ts-api-utils": "^2.5.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.0.tgz", + "integrity": "sha512-82r66fi9zYwZ+mTq3vKgwjbZ1PVk/DJzrXFLpG6RnBbdvH8TEGVHIs9H4d2drhkOzf0syZuD/OZvvlu6GDbP4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.9.1", + "@typescript-eslint/scope-manager": "8.62.0", + "@typescript-eslint/types": "8.62.0", + "@typescript-eslint/typescript-estree": "8.62.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.0.tgz", + "integrity": "sha512-CY3uyFSRbcQv3nnSv8S0+lDftMVz6P963PoRlxrV7ew/Md564g9ut60PYzdLM5qW4jFn93GBF+Soi90ISAN+GQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.62.0", + "eslint-visitor-keys": "^5.0.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", + "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@typescript-eslint/parser": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.61.1.tgz", - "integrity": "sha512-PJ5vePq5/ognBbrIcoC5+SHO5dfpeLPzP9FpLkzWrguoYQEeeSjlJpVwOpo1JRSTEi7dRcwNy4h4dzV70PqHcg==", + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.0.tgz", + "integrity": "sha512-dzHeT2gySzZtLDsuqxU9AkYgIsQoHAHtRBpOqM+Ofzx1Bwrd2RcCjQJ+6iQbsHOIR6NS33bF2W1k3blN1zLDrA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.61.1", - "@typescript-eslint/types": "8.61.1", - "@typescript-eslint/typescript-estree": "8.61.1", - "@typescript-eslint/visitor-keys": "8.61.1", + "@typescript-eslint/scope-manager": "8.62.0", + "@typescript-eslint/types": "8.62.0", + "@typescript-eslint/typescript-estree": "8.62.0", + "@typescript-eslint/visitor-keys": "8.62.0", "debug": "^4.4.3" }, "engines": { @@ -6119,6 +6273,136 @@ "typescript": ">=4.8.4 <6.1.0" } }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.0.tgz", + "integrity": "sha512-wexnCqiTg7BOGtbLDftYpRWlmLq4xfoMd7BKFR6Y75sZS3QmRKLdN3yWLhmIYgqMmP/OXWpj3H8odkb5nGURCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/tsconfig-utils": "^8.62.0", + "@typescript-eslint/types": "^8.62.0", + "debug": "^4.4.3" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.0.tgz", + "integrity": "sha512-1lX38kNxXIRb8mEc3lbq5mdHq1Pf2+U0nFU65KfT18mtPxxl0fvjuEE92mHuXPuCtElJhOrddOpyMlM3Z0umEA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.62.0", + "@typescript-eslint/visitor-keys": "8.62.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.0.tgz", + "integrity": "sha512-y2GAdB6ykaXUvuspbYnizQc4oDDz0Tz/Yc7iWrXf9mx8vm/L/0vLHCe0tS2boG96Zy+DivnVDQ9ZUEWoHqqx1g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz", + "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.0.tgz", + "integrity": "sha512-+hVbNxtW64pIcZWDPGbyaKF7vp2IBTVY5ma1blwwksrjdsbdqqEKvJWMGbBofei4F6Dovx1M0RJgoFeNu2279A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/project-service": "8.62.0", + "@typescript-eslint/tsconfig-utils": "8.62.0", + "@typescript-eslint/types": "8.62.0", + "@typescript-eslint/visitor-keys": "8.62.0", + "debug": "^4.4.3", + "minimatch": "^10.2.2", + "semver": "^7.7.3", + "tinyglobby": "^0.2.15", + "ts-api-utils": "^2.5.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.0.tgz", + "integrity": "sha512-CY3uyFSRbcQv3nnSv8S0+lDftMVz6P963PoRlxrV7ew/Md564g9ut60PYzdLM5qW4jFn93GBF+Soi90ISAN+GQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.62.0", + "eslint-visitor-keys": "^5.0.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", + "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@typescript-eslint/project-service": { "version": "8.61.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.61.1.tgz", @@ -6177,15 +6461,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.61.1.tgz", - "integrity": "sha512-GYRicKmVK0C4fsKgaACaknOUAq9Oa2kwsjnpFhFcS/5p4Ht5IP9OVLbgIgcK4SRk92nVHFluurg1lumD9dBcLw==", + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.62.0.tgz", + "integrity": "sha512-+g5O3j0w2ldzC86Pv6fvbO/xhAonbJFIdf/MKQ1d30gndlsVzUOE83ldfSE15Qrl9fhFjK6AovHs5Wpp6vx86w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.61.1", - "@typescript-eslint/typescript-estree": "8.61.1", - "@typescript-eslint/utils": "8.61.1", + "@typescript-eslint/types": "8.62.0", + "@typescript-eslint/typescript-estree": "8.62.0", + "@typescript-eslint/utils": "8.62.0", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -6201,6 +6485,160 @@ "typescript": ">=4.8.4 <6.1.0" } }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/project-service": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.0.tgz", + "integrity": "sha512-wexnCqiTg7BOGtbLDftYpRWlmLq4xfoMd7BKFR6Y75sZS3QmRKLdN3yWLhmIYgqMmP/OXWpj3H8odkb5nGURCQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/tsconfig-utils": "^8.62.0", + "@typescript-eslint/types": "^8.62.0", + "debug": "^4.4.3" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.0.tgz", + "integrity": "sha512-1lX38kNxXIRb8mEc3lbq5mdHq1Pf2+U0nFU65KfT18mtPxxl0fvjuEE92mHuXPuCtElJhOrddOpyMlM3Z0umEA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.62.0", + "@typescript-eslint/visitor-keys": "8.62.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/tsconfig-utils": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.0.tgz", + "integrity": "sha512-y2GAdB6ykaXUvuspbYnizQc4oDDz0Tz/Yc7iWrXf9mx8vm/L/0vLHCe0tS2boG96Zy+DivnVDQ9ZUEWoHqqx1g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz", + "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.0.tgz", + "integrity": "sha512-+hVbNxtW64pIcZWDPGbyaKF7vp2IBTVY5ma1blwwksrjdsbdqqEKvJWMGbBofei4F6Dovx1M0RJgoFeNu2279A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/project-service": "8.62.0", + "@typescript-eslint/tsconfig-utils": "8.62.0", + "@typescript-eslint/types": "8.62.0", + "@typescript-eslint/visitor-keys": "8.62.0", + "debug": "^4.4.3", + "minimatch": "^10.2.2", + "semver": "^7.7.3", + "tinyglobby": "^0.2.15", + "ts-api-utils": "^2.5.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.0.tgz", + "integrity": "sha512-82r66fi9zYwZ+mTq3vKgwjbZ1PVk/DJzrXFLpG6RnBbdvH8TEGVHIs9H4d2drhkOzf0syZuD/OZvvlu6GDbP4g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.9.1", + "@typescript-eslint/scope-manager": "8.62.0", + "@typescript-eslint/types": "8.62.0", + "@typescript-eslint/typescript-estree": "8.62.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.0.tgz", + "integrity": "sha512-CY3uyFSRbcQv3nnSv8S0+lDftMVz6P963PoRlxrV7ew/Md564g9ut60PYzdLM5qW4jFn93GBF+Soi90ISAN+GQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.62.0", + "eslint-visitor-keys": "^5.0.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", + "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@typescript-eslint/types": { "version": "8.61.1", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.61.1.tgz", @@ -14299,6 +14737,85 @@ "typescript": ">=4.8.4 <6.1.0" } }, + "node_modules/typescript-eslint/node_modules/@typescript-eslint/eslint-plugin": { + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.1.tgz", + "integrity": "sha512-ZPlVl3PB3et/59Ne0fv/sci6ZXz4T4Hp4nTJ56i/Y0gR89ARb+KphojTq6j+56E5PIezmOIOOWyY+aWQFd+IkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/regexpp": "^4.12.2", + "@typescript-eslint/scope-manager": "8.61.1", + "@typescript-eslint/type-utils": "8.61.1", + "@typescript-eslint/utils": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1", + "ignore": "^7.0.5", + "natural-compare": "^1.4.0", + "ts-api-utils": "^2.5.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^8.61.1", + "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/typescript-eslint/node_modules/@typescript-eslint/parser": { + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.61.1.tgz", + "integrity": "sha512-PJ5vePq5/ognBbrIcoC5+SHO5dfpeLPzP9FpLkzWrguoYQEeeSjlJpVwOpo1JRSTEi7dRcwNy4h4dzV70PqHcg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/scope-manager": "8.61.1", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1", + "debug": "^4.4.3" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/typescript-eslint/node_modules/@typescript-eslint/type-utils": { + "version": "8.61.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.61.1.tgz", + "integrity": "sha512-GYRicKmVK0C4fsKgaACaknOUAq9Oa2kwsjnpFhFcS/5p4Ht5IP9OVLbgIgcK4SRk92nVHFluurg1lumD9dBcLw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1", + "@typescript-eslint/utils": "8.61.1", + "debug": "^4.4.3", + "ts-api-utils": "^2.5.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", + "typescript": ">=4.8.4 <6.1.0" + } + }, "node_modules/ua-parser-js": { "version": "0.7.40", "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.40.tgz", diff --git a/client/package.json b/client/package.json index 753f865a34..1a7d29a25e 100644 --- a/client/package.json +++ b/client/package.json @@ -117,8 +117,8 @@ "@types/qrcode": "^1.5.6", "@types/tinycolor2": "^1.4.6", "@types/video.js": "^7.3.58", - "@typescript-eslint/eslint-plugin": "^8.61.0", - "@typescript-eslint/parser": "^8.61.0", + "@typescript-eslint/eslint-plugin": "^8.62.0", + "@typescript-eslint/parser": "^8.62.0", "@vendure/ngx-translate-extract": "^10.1.3", "angular-eslint": "^21.4.0", "eslint": "^9.39.4", From ae5ec1e04dcd5db0709f1a749b3159e0335395f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jun 2026 09:47:09 +0200 Subject: [PATCH 12/71] Bump the tiptap group in /client with 14 updates (#6318) --- client/package-lock.json | 384 +++++++++++++++++++-------------------- client/package.json | 20 +- 2 files changed, 202 insertions(+), 202 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index ffee8da5ce..9f5a5308ef 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -31,20 +31,20 @@ "@ngx-translate/core": "^17.0.0", "@ngx-translate/http-loader": "^17.0.0", "@openslides/motion-diff": "file:../packages/openslides-motion-diff", - "@tiptap/core": "^3.26.1", - "@tiptap/extension-color": "^3.26.1", - "@tiptap/extension-highlight": "^3.26.1", - "@tiptap/extension-image": "^3.26.1", + "@tiptap/core": "^3.27.1", + "@tiptap/extension-color": "^3.27.1", + "@tiptap/extension-highlight": "^3.27.1", + "@tiptap/extension-image": "^3.27.1", "@tiptap/extension-link": "^3.23.4", "@tiptap/extension-list": "^3.22.4", - "@tiptap/extension-subscript": "^3.26.1", - "@tiptap/extension-superscript": "^3.26.1", - "@tiptap/extension-table": "^3.26.1", - "@tiptap/extension-text-align": "^3.26.1", + "@tiptap/extension-subscript": "^3.27.1", + "@tiptap/extension-superscript": "^3.27.1", + "@tiptap/extension-table": "^3.27.1", + "@tiptap/extension-text-align": "^3.27.1", "@tiptap/extension-text-style": "^3.4.2", "@tiptap/extensions": "^3.22.4", - "@tiptap/pm": "^3.26.0", - "@tiptap/starter-kit": "^3.26.1", + "@tiptap/pm": "^3.27.1", + "@tiptap/starter-kit": "^3.27.1", "@tsparticles/angular": "^3.0.0", "@tsparticles/engine": "^3.9.1", "@tsparticles/plugin-emitters": "^3.9.1", @@ -4884,191 +4884,219 @@ } }, "node_modules/@tiptap/core": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.26.1.tgz", - "integrity": "sha512-TX9PyPqBoix0qDLjtok/bddtdSy54QhzLVha405C07V+WySOpH3s/pWYkywehZQY0SQtcrcY4MNSCeQjCbA28A==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.27.1.tgz", + "integrity": "sha512-rV6Qn4wmC6BxfF+4mu6bqGWj9vA4oXXhsrpXaJL2uhjxeHAGofjwcHof2X84VYzeyXgdlsGmqKie4TAppVXZUQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/pm": "3.26.1" + "@tiptap/pm": "3.27.1" } }, "node_modules/@tiptap/extension-blockquote": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.26.1.tgz", - "integrity": "sha512-WaKjKmUaadgvZDDBk9JOn/oidlOFr6booqJIWHGL5S0aUUTKHS19oGfKQq/l9Z1y1niaRePk0Y4fy/jxCnfKPA==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.27.1.tgz", + "integrity": "sha512-VMF7xJx6qEGiX6DTKNiL31NLqypOcd/4sNjFSe8rb41PwejBJh/nOqVIbBvWkiT6NMGFLxMhj7zJ8/zPo1hXeg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extension-bold": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.26.1.tgz", - "integrity": "sha512-VIlF2sAiV6K009pcIDotfY8mvsPaq90dxeG9Q0ZIqfMD958TUCqjHw4MGYZf0/FgP12xksBfmcR7W312xgUf9Q==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.27.1.tgz", + "integrity": "sha512-TlC5bsS+pqETTrlz4CZz9RO/cKBYtELGIxwtKeivUn3eNfnOxQbbu4WDsiwIfzRFyd0OMnKl6BPM2KnYEehoEQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extension-bullet-list": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.26.1.tgz", - "integrity": "sha512-JB6bEJJHxXNAXEXTIAN3/j70p1ARHdeMfhzshGZswWKUWtDibTCrspIp7p1VNeiuVtJ/HB6PpFkGi7yWtQ3RTg==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.27.1.tgz", + "integrity": "sha512-faCUHnRP47o9Zh9VZZX6EX/569udw9Vopm2PgEKPWuKLE2qaS5WBuUVU0iItdJmKUqaWiOZkpoW4jvnDmj0dfg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.26.1" + "@tiptap/extension-list": "3.27.1" } }, "node_modules/@tiptap/extension-code": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.26.1.tgz", - "integrity": "sha512-t9/VR5k3rGPyhcGau9YvVgaAQ+nP9R9WzS996bQQ7GIrMOTSXb0FWwoQFBiYl83V6VA16Tlj/oScC7SFlA8lvA==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.27.1.tgz", + "integrity": "sha512-epOUpFfEmBzjvnqvjv2qHX7NAuLo5dlOGV690lWu+sAYMjibuJBeVvAiKPyFCfRCCTUxdbDB3jbaOA1yEcEJ7w==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" + } + }, + "node_modules/@tiptap/extension-code-block": { + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.27.1.tgz", + "integrity": "sha512-pHlzmZx2OlHfyQ0yRlT5UL4mGokz947DthZuYefN1OleVqOkHpWBG+2JQwqoNq6bmzMne92zbH32rhcJUEYSjA==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/ueberdosis" + }, + "peerDependencies": { + "@tiptap/core": "3.27.1", + "@tiptap/pm": "3.27.1" } }, "node_modules/@tiptap/extension-color": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-color/-/extension-color-3.26.1.tgz", - "integrity": "sha512-f8yy+CBRDqMeaIaQ0UHDbGUqjfGka5O16ja47shatXm49lqLcL06js9tGoiZFVzp9/lcKOLSXjuzxNf0OZ9SbA==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-color/-/extension-color-3.27.1.tgz", + "integrity": "sha512-9R/vW4dDTce0E0HU+AyfSkKhz08Hlrx7noRRj3CKrTwsCTR86wReTKFHlzxhLKZiDrJuV2Y7CtNG7KGrAArf+A==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-text-style": "3.26.1" + "@tiptap/extension-text-style": "3.27.1" } }, "node_modules/@tiptap/extension-document": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.26.1.tgz", - "integrity": "sha512-6W2vZjvi0Mv+4xEtwMDGhWwo7FotWR6eKfmntmduvehWevFpMxOKcTtyotjLigfZv738y50YWmvbaPuAPJG3BA==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.27.1.tgz", + "integrity": "sha512-8FbBTkfnRP4iVaoj+2h3iWa+H0eGDD3yTyVCwrmue/sQTkqUNUoSuAZa3GDG4Sd41xdPwTJxl9nUWGgM1qDCnw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extension-dropcursor": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.26.1.tgz", - "integrity": "sha512-eVq3BvFIa3YD+pBIlj1i72vYEixlegGVKHnSYiVF2ovkQOSAH9sca7pkq6WgV1sMTCyWCU8e+WznTqtydvHUWA==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.27.1.tgz", + "integrity": "sha512-blFf9x9RG0Qr7P3FoAH/033ffa+mMLZn34trVs8Vi0Ppk6FmJAg5HpYFOtmYoeREdNDJ5rHJKV7SoACbOHgskQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "3.26.1" + "@tiptap/extensions": "3.27.1" } }, "node_modules/@tiptap/extension-gapcursor": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.26.1.tgz", - "integrity": "sha512-BWW1yMQQA4TbEU0LLK+4cd9ebLTuZG5KjHwFMBRD/bGiRW9V1gTWFsCqThBbczcANoQiZK9pn5/4Ad/rGM3HUg==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.27.1.tgz", + "integrity": "sha512-QoezN0wdvXIwLQ4ee2ccWDaX3RG0lzgQpIMpMz55oPDhpUVax1+19ApsS53LkcktpS4EbnPL4xO4DaJk0Vp7PQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "3.26.1" + "@tiptap/extensions": "3.27.1" } }, "node_modules/@tiptap/extension-hard-break": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.26.1.tgz", - "integrity": "sha512-gzNb1e/fK6HN+ko1axsrasjK7F1q0Bnm0G4ZY/0eq7pV7s1wZuwoCiGbvUx/9LCFKRV6+94FTqlb0A3NbYN36g==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.27.1.tgz", + "integrity": "sha512-iv/m9hzl6jfSj9Q8UEjAxONvCoUDaP7M9SRCPx3PaLNxA230TTD6RE0Ye4zFJ8ze7ZVoJJMAqg9Qpq1iYg2JOQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extension-heading": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.26.1.tgz", - "integrity": "sha512-eRlv9XxzUL8FobKAiF1WjP35CT2QpbcxxeyYFF7BmGEONvKI7r5g7JGwyGli4Cvclh70h8w6JuoXSmGUVEU65A==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.27.1.tgz", + "integrity": "sha512-SrC4l1kEIyv9ZXFaI/8LQqU2MyMmjczw7XXsWUQOTN4YXv0JyVgMNR3cI/wz0d2xsTfBdZ1N85Tdng+Ga1t0Sg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extension-highlight": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-highlight/-/extension-highlight-3.26.1.tgz", - "integrity": "sha512-qgx4Eetqkogh3OyomZO0yIMQGHhjatCDAtELkC7NQxnmPsp2c9i6ck/hh7mP5We5ccBwUoYRuNGC9lkflCx75g==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-highlight/-/extension-highlight-3.27.1.tgz", + "integrity": "sha512-IeMIUKbW4oyRkgn92BPYQ0fifkbTwVigKwa107nGDHMokz+pHQPFHy8xG3U7gtUOra/8OUo57bFgNGuP0TaH4A==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/ueberdosis" + }, + "peerDependencies": { + "@tiptap/core": "3.27.1" + } + }, + "node_modules/@tiptap/extension-horizontal-rule": { + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.27.1.tgz", + "integrity": "sha512-QlKE7qn5qMnIGVGhXQlvYedvLtNJ9z0dmit5w8vPb8tKzW4Spk6M7N2kruprrDA8GBwHfeR5wmF+njfUm34qxg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1", + "@tiptap/pm": "3.27.1" } }, "node_modules/@tiptap/extension-image": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.26.1.tgz", - "integrity": "sha512-IjoT+kRK4a1sTImvUz257yfk5l9kMxXxfxCfix5AUKdiWyn8SGUjJZapLICcZVY05UDqXmwsBvBK9lHkKX5ERg==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.27.1.tgz", + "integrity": "sha512-+JTahgQT+NxiGjduaB3qJVyhU/wh4m3pVkht1Earioku2bm/apj5Lb8rSowa/NJYP3B+oQgV/V4YLw5dtDgBoA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extension-italic": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.26.1.tgz", - "integrity": "sha512-cLKYvOLToWEkJkAPspgIZ/PYDzAxacLm1VWcAq1tO1QDQCDe2Kw+y/zsGlyYEq/aKsAgpp4JNopBwAXRXxt2/A==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.27.1.tgz", + "integrity": "sha512-jGGeyn9uRUnNjSTHpbqhiGsp6KaYTSbV09jDXPJI9cDwfV9hpugLvpaCZd0BMBbhU1B1W6kOfX0BE15qX/HQfA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extension-link": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.26.1.tgz", - "integrity": "sha512-aLLGLgikuhLFHRbjfUC6D4gRg+NUty4uhW7YkyVl8AxxPME47dPbCOX4H6uLCjEZcn3WnfNuCTr6HCTl0KEmGA==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.27.1.tgz", + "integrity": "sha512-/2jBfsxBZUDGJmpZifqRQPz7f1E5qpS1BckTZ39TADzUJX+feKy7RJ3DtQ02+8y6SSMzvP9loGVjrk6zEMTk4g==", "license": "MIT", "dependencies": { "linkifyjs": "^4.3.3" @@ -5078,201 +5106,201 @@ "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1", - "@tiptap/pm": "3.26.1" + "@tiptap/core": "3.27.1", + "@tiptap/pm": "3.27.1" } }, "node_modules/@tiptap/extension-list": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.26.1.tgz", - "integrity": "sha512-06nOjnyXpzMO8Ys5k3IbYsDsKib1mv2OtaxBYX1/1uvRyOKwUX5tqDLb/qigic0LIANNL73lkNC8Z8XPeG4Tkg==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.27.1.tgz", + "integrity": "sha512-c2Upru7lj0/ZV/Ibww6cNz6sUS8m6Dp/9uygFhYcZOd3X8M0xBIEk42c6m6SQehkPziVA8QOgNJz7sMqsbz1OQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1", - "@tiptap/pm": "3.26.1" + "@tiptap/core": "3.27.1", + "@tiptap/pm": "3.27.1" } }, "node_modules/@tiptap/extension-list-item": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.26.1.tgz", - "integrity": "sha512-5gLXJUiP763NA6i4HgrtcwUDXPP8820hsaBQyF1Y1VsXNi02uW9FVLe3RZK8jF0NZUNh9CqD0gogYJCbKOUU8A==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.27.1.tgz", + "integrity": "sha512-zwRl01ETfCkWUvtvK5fw9bXtAajMPkvlkE3Cq6JvH3LF7XXJwDtNj5Tj7exacMpCaSZmlNc43vFb2rAYnrnwMA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.26.1" + "@tiptap/extension-list": "3.27.1" } }, "node_modules/@tiptap/extension-list-keymap": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.26.1.tgz", - "integrity": "sha512-EReSayePO6SIxtRbxx+7KfBQreWHvoZmMb3O/RemfT8W6J0hCG5N/Rh8Z12+YZOnCDRXJ4RzFpAikYka3E54jQ==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.27.1.tgz", + "integrity": "sha512-OIMZNlzPSO8WRd4ic73Fxckzl4N1tesjjLL2XApaNA/uMpO0LoF6WSRPAWv+Z24Wp92ARRJAnRP7iZoI5+Jxig==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.26.1" + "@tiptap/extension-list": "3.27.1" } }, "node_modules/@tiptap/extension-ordered-list": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.26.1.tgz", - "integrity": "sha512-LeFPeFwb7ylkQVuuaHj+niu7WhWHpjDOi1GKZJE/ohOa2lgt7P221HMqhUzPiDlXOExN72oWTNmXUlT0ymCTkw==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.27.1.tgz", + "integrity": "sha512-GYrKqD//9nHJ2r80uXqbDMzRnFpGzbaEQRTSGaO/SH7DvXWFMow8evkOdjQ7PCQO07jNjJo75+A85Jwu3Ov3AA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.26.1" + "@tiptap/extension-list": "3.27.1" } }, "node_modules/@tiptap/extension-paragraph": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.26.1.tgz", - "integrity": "sha512-OkBeYUNM3eTzjm3z6IcC3NHryOX8g3eGNI86P/B+tFoFQSRuzLsKZU50ARCfIiLLg812NjcqujeJ1eX3BKDZrw==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.27.1.tgz", + "integrity": "sha512-7K7eo1gruOgAsnbK+GCV23AUVUI0cL1bTig8HaPneoFMVbig7vddk8jNLKBWO8TXVbG7TuHdnDN4F98vdtwh5Q==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extension-strike": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.26.1.tgz", - "integrity": "sha512-7hmQ2mBsA+75GRrJIKYxb+10H23mblEQSGGsv9Ptl7JLaGmj+8sv2HGQGSUT9QBiBVprxaYTqyWFXQC9akfLWg==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.27.1.tgz", + "integrity": "sha512-Y3DW1jlSlCNCyMGHP3+3qBNNPS83wuFz4RTYGjZtvRRTCRh7apZme9XRWMq1rN5mJ2Cr7fKocA2/5Bs13KgN6Q==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extension-subscript": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-3.26.1.tgz", - "integrity": "sha512-6f4LOwmIBpCcdpwhRtK+euBS1yat1ZQ7Ok8ALTv9B6LSPnEZFAR15CxegLHFpP0k2YF99Qo+oUACdkUjDJxOLQ==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-3.27.1.tgz", + "integrity": "sha512-A8bokr7c7QBndZcMX0F4AK1y4xEYd5MvOczojFusaiTfvAnH3D8PwFbOPQs3ZLB8W9K3bn4g/XH55P1IAPFGyg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1", - "@tiptap/pm": "3.26.1" + "@tiptap/core": "3.27.1", + "@tiptap/pm": "3.27.1" } }, "node_modules/@tiptap/extension-superscript": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-3.26.1.tgz", - "integrity": "sha512-gJ2fxXQN6DiqCSzaHpAsWzFHc967Yqvo55+sYj1xxkPYqtJfODdi2mVgA1dNuN7v8g4qexTpbvne1c4m57cJ2Q==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-3.27.1.tgz", + "integrity": "sha512-8021uld246dqhtzZdzjvnWcfiJwElPQ50zZe7Fc3QGFiNRDVWQ2ATXGJFmXEopgCU5GuZaytPMtAq4UVDXc6xw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1", - "@tiptap/pm": "3.26.1" + "@tiptap/core": "3.27.1", + "@tiptap/pm": "3.27.1" } }, "node_modules/@tiptap/extension-table": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.26.1.tgz", - "integrity": "sha512-epxUhc5ecxsH39lzNejc2WxFPXAXWGs9g2ofKDrIaoSlZlfFHf89/sEGSz048a46E5Sb+fYCtzUvRUUx+aG4xw==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.27.1.tgz", + "integrity": "sha512-tNB8kjxo0+XPremnWkd6NUikpeJ+JQrss7HntL8GgIxX4t0gkdnLn9yUWb0JzcaYP7Y8iTZZHdkPs0P154DG8Q==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1", - "@tiptap/pm": "3.26.1" + "@tiptap/core": "3.27.1", + "@tiptap/pm": "3.27.1" } }, "node_modules/@tiptap/extension-text": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.26.1.tgz", - "integrity": "sha512-Gocui5WvcCCJJIX17gdOVCSdYi5H4fDwaR0qkMAUZPq5kJCdrfl+vNpt8BTt53Bk+/QumiUW21fhQ184w7RoeQ==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.27.1.tgz", + "integrity": "sha512-6ZwaZwSrDh+KFFv6V1J79oO37yPs7y1bFxvk1/9Ih2rn3Xr5AWz+eMS+n8RpH3djBVVAQpdIAeYQgcn+VCSsTg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extension-text-align": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.26.1.tgz", - "integrity": "sha512-Ptbu1FyASFqIrbw/p9D6zLt8G7seDh4X408qU9FIrun7PE79o+amB5LWI/SzHFuVk3OMI+g7jE/mMDhNUYsqVA==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.27.1.tgz", + "integrity": "sha512-EXawuJBO55wd8WcTbHTMoPhv0CGQxza4yCCPB5Hqz4ZPQwahIr3ej+8yp/kimIl0xokabwZ0/Fu8STQ4AkZv5g==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extension-text-style": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.26.1.tgz", - "integrity": "sha512-V8t7qOyLH7IBR2HjjJVZ9rUHTnuFToJx07L9PN9PpgQLhz9q8Jah4gAwmjLBXDRG2YaXImGK0RwKKCU/yHhwOg==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.27.1.tgz", + "integrity": "sha512-J48WIl+6YDYTFPhWXUBQk+u7+AKVUqTdvrZOQyPYCGuQMgHrYzgWrI5+HeEifUgXJ5rMIWWP3qytp7KhVVqpDQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extension-underline": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.26.1.tgz", - "integrity": "sha512-HUHtQ+DRWDM0opW7Nk3YQwrLzw876hMU7cr1X/ZTG+8Bp+AKHihlwU+bqrPgG5St0mqASyUEhHQ/vK5PlnUYOQ==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.27.1.tgz", + "integrity": "sha512-N889J4nXN/TPfVt8uF9N1A0SY82E90zwc1y26lqOcw6KWNLmQrlhMh/9OD4ikLDbekmFpOBq/UicpHf/6S8hbQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1" + "@tiptap/core": "3.27.1" } }, "node_modules/@tiptap/extensions": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.26.1.tgz", - "integrity": "sha512-PmRaoe6bebTgz/ZQrjmzwZMST1d9js9ZTiKnUXeXl3Fm+V5U/c3TbbKDfqmL63qPQdjtShDMHi9tYuv+c77OFQ==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.27.1.tgz", + "integrity": "sha512-1Tdx9faw8k0/83V6X+xCDVhV8yElGt95JxeW3YMkKQJI56QdlPz0xOdJPlMiSGJKinPyVier+x9LJD/YZUZIaw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.26.1", - "@tiptap/pm": "3.26.1" + "@tiptap/core": "3.27.1", + "@tiptap/pm": "3.27.1" } }, "node_modules/@tiptap/pm": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.26.1.tgz", - "integrity": "sha512-48cJQRbvr9Ux0+IgM1BR5vOLU5hkC+n+uerdQy2JjrIRKpYE/huU8fQFm6PoRppoKYfilklzb29elsQ+n2TA+g==", + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.27.1.tgz", + "integrity": "sha512-Ffjx+vimmBU7zH/KrpXzJid3+pziCe/VL2aexSTP63cyQwKQ65LkFkCKaIsSpFdQQuakVZBGWjCA5RoBV852pw==", "license": "MIT", "dependencies": { "prosemirror-changeset": "^2.3.0", @@ -5295,69 +5323,41 @@ } }, "node_modules/@tiptap/starter-kit": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.26.1.tgz", - "integrity": "sha512-A0zsvwGU9exLND34F8e8KqUXFSfs835tNN+VC+ZT3yNeaO/WXnlh/Cgal1F6pHHbcxy7RV2CRwJU5S3cWLPxrA==", - "license": "MIT", - "dependencies": { - "@tiptap/core": "^3.26.1", - "@tiptap/extension-blockquote": "^3.26.1", - "@tiptap/extension-bold": "^3.26.1", - "@tiptap/extension-bullet-list": "^3.26.1", - "@tiptap/extension-code": "^3.26.1", - "@tiptap/extension-code-block": "^3.26.1", - "@tiptap/extension-document": "^3.26.1", - "@tiptap/extension-dropcursor": "^3.26.1", - "@tiptap/extension-gapcursor": "^3.26.1", - "@tiptap/extension-hard-break": "^3.26.1", - "@tiptap/extension-heading": "^3.26.1", - "@tiptap/extension-horizontal-rule": "^3.26.1", - "@tiptap/extension-italic": "^3.26.1", - "@tiptap/extension-link": "^3.26.1", - "@tiptap/extension-list": "^3.26.1", - "@tiptap/extension-list-item": "^3.26.1", - "@tiptap/extension-list-keymap": "^3.26.1", - "@tiptap/extension-ordered-list": "^3.26.1", - "@tiptap/extension-paragraph": "^3.26.1", - "@tiptap/extension-strike": "^3.26.1", - "@tiptap/extension-text": "^3.26.1", - "@tiptap/extension-underline": "^3.26.1", - "@tiptap/extensions": "^3.26.1", - "@tiptap/pm": "^3.26.1" + "version": "3.27.1", + "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.27.1.tgz", + "integrity": "sha512-vfxRsqW8rCc0k4pzo0ilU3wobVi2wqVj88VZI2SlgZlNnUAkrDGDIAph7CTa9k9fshV+O1ivpEgPC5yC046jow==", + "license": "MIT", + "dependencies": { + "@tiptap/core": "^3.27.1", + "@tiptap/extension-blockquote": "^3.27.1", + "@tiptap/extension-bold": "^3.27.1", + "@tiptap/extension-bullet-list": "^3.27.1", + "@tiptap/extension-code": "^3.27.1", + "@tiptap/extension-code-block": "^3.27.1", + "@tiptap/extension-document": "^3.27.1", + "@tiptap/extension-dropcursor": "^3.27.1", + "@tiptap/extension-gapcursor": "^3.27.1", + "@tiptap/extension-hard-break": "^3.27.1", + "@tiptap/extension-heading": "^3.27.1", + "@tiptap/extension-horizontal-rule": "^3.27.1", + "@tiptap/extension-italic": "^3.27.1", + "@tiptap/extension-link": "^3.27.1", + "@tiptap/extension-list": "^3.27.1", + "@tiptap/extension-list-item": "^3.27.1", + "@tiptap/extension-list-keymap": "^3.27.1", + "@tiptap/extension-ordered-list": "^3.27.1", + "@tiptap/extension-paragraph": "^3.27.1", + "@tiptap/extension-strike": "^3.27.1", + "@tiptap/extension-text": "^3.27.1", + "@tiptap/extension-underline": "^3.27.1", + "@tiptap/extensions": "^3.27.1", + "@tiptap/pm": "^3.27.1" }, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" } }, - "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-code-block": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.26.1.tgz", - "integrity": "sha512-NY7SYqcrqDVYTSWyaNGdSfCims6pOHoRQ2Rh4DEFb/rb8gLVkqbLZhcHzQCVfinlPqgV3xWF6cYMORwmnlBkXQ==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "3.26.1", - "@tiptap/pm": "3.26.1" - } - }, - "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-horizontal-rule": { - "version": "3.26.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.26.1.tgz", - "integrity": "sha512-l9lPZYeSmY90y/2GkQcKaICFD5Atr8sx2SzJGkQzpNC9tRxZXyAHnfJE3OjBkspuGzjWIN0DimxBj4ibz58sKw==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "3.26.1", - "@tiptap/pm": "3.26.1" - } - }, "node_modules/@ts-morph/common": { "version": "0.29.0", "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.29.0.tgz", diff --git a/client/package.json b/client/package.json index 1a7d29a25e..12787a4075 100644 --- a/client/package.json +++ b/client/package.json @@ -54,20 +54,20 @@ "@ngx-translate/core": "^17.0.0", "@ngx-translate/http-loader": "^17.0.0", "@openslides/motion-diff": "file:../packages/openslides-motion-diff", - "@tiptap/core": "^3.26.1", - "@tiptap/extension-color": "^3.26.1", - "@tiptap/extension-highlight": "^3.26.1", - "@tiptap/extension-image": "^3.26.1", + "@tiptap/core": "^3.27.1", + "@tiptap/extension-color": "^3.27.1", + "@tiptap/extension-highlight": "^3.27.1", + "@tiptap/extension-image": "^3.27.1", "@tiptap/extension-link": "^3.23.4", "@tiptap/extension-list": "^3.22.4", - "@tiptap/extension-subscript": "^3.26.1", - "@tiptap/extension-superscript": "^3.26.1", - "@tiptap/extension-table": "^3.26.1", - "@tiptap/extension-text-align": "^3.26.1", + "@tiptap/extension-subscript": "^3.27.1", + "@tiptap/extension-superscript": "^3.27.1", + "@tiptap/extension-table": "^3.27.1", + "@tiptap/extension-text-align": "^3.27.1", "@tiptap/extension-text-style": "^3.4.2", "@tiptap/extensions": "^3.22.4", - "@tiptap/pm": "^3.26.0", - "@tiptap/starter-kit": "^3.26.1", + "@tiptap/pm": "^3.27.1", + "@tiptap/starter-kit": "^3.27.1", "@tsparticles/angular": "^3.0.0", "@tsparticles/engine": "^3.9.1", "@tsparticles/plugin-emitters": "^3.9.1", From 8f013c648eb3fe2b6762fa0393310b6c29ad979c Mon Sep 17 00:00:00 2001 From: Loki Elble <69210919+Elblinator@users.noreply.github.com> Date: Thu, 25 Jun 2026 10:05:41 +0200 Subject: [PATCH 13/71] Change sorting of meeting in dashboard (#6328) --- .../dashboard/dashboard.component.ts | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/components/dashboard/dashboard.component.ts b/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/components/dashboard/dashboard.component.ts index d79370d5ff..6cbc840435 100644 --- a/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/components/dashboard/dashboard.component.ts +++ b/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/components/dashboard/dashboard.component.ts @@ -1,5 +1,4 @@ -import { Component, ViewEncapsulation } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; +import { Component, inject, ViewEncapsulation } from '@angular/core'; import { Observable } from 'rxjs'; import { BaseComponent } from 'src/app/site/base/base.component'; import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; @@ -46,13 +45,12 @@ export class DashboardComponent extends BaseComponent { public futureMeetings: ViewMeeting[] = []; public noDateMeetings: ViewMeeting[] = []; - public constructor( - protected override translate: TranslateService, - private orgaService: OrganizationService, - private meetingRepo: MeetingControllerService, - private themeService: ThemeService, - public operator: OperatorService - ) { + public operator = inject(OperatorService); + private orgaService = inject(OrganizationService); + private meetingRepo = inject(MeetingControllerService); + private themeService = inject(ThemeService); + + public constructor() { super(); super.setTitle(`Calendar`); this.loadMeetings(); @@ -95,12 +93,22 @@ export class DashboardComponent extends BaseComponent { this.noDateMeetings = filteredMeetings.filter(meeting => meeting.relatedTime === RelatedTime.Dateless); this.previousMeetings = filteredMeetings .filter(meeting => meeting.relatedTime === RelatedTime.Past) - .sort((a, b) => b.end_time - a.end_time); + .sort((a, b) => this.sortMeeting(a, b)) + .reverse(); this.futureMeetings = filteredMeetings .filter(meeting => meeting.relatedTime === RelatedTime.Future) - .sort((a, b) => a.end_time - b.end_time); - this.currentMeetings = filteredMeetings.filter(meeting => meeting.relatedTime === RelatedTime.Current); + .sort((a, b) => this.sortMeeting(a, b)); + this.currentMeetings = filteredMeetings + .filter(meeting => meeting.relatedTime === RelatedTime.Current) + .sort((a, b) => this.sortMeeting(a, b)); }) ); } + + private sortMeeting(a: ViewMeeting, b: ViewMeeting): number { + if (a.start_time !== b.start_time) { + return a.start_time - b.start_time; + } + return a.end_time - b.end_time; + } } From d74dfd8ee903999b970caf75b6feaf01e3c5bcb3 Mon Sep 17 00:00:00 2001 From: Loki Elble <69210919+Elblinator@users.noreply.github.com> Date: Thu, 25 Jun 2026 15:13:10 +0200 Subject: [PATCH 14/71] Remove self from delete payload in participant-list (#6303) --- .../user-multiselect-actions.component.html | 14 +-- .../user-multiselect-actions.component.ts | 95 +++++++++---------- .../participant-list.component.html | 3 +- .../participant-list.component.ts | 67 +++++++------ 4 files changed, 90 insertions(+), 89 deletions(-) diff --git a/client/src/app/site/modules/user-components/components/user-multiselect-actions/user-multiselect-actions.component.html b/client/src/app/site/modules/user-components/components/user-multiselect-actions/user-multiselect-actions.component.html index d7fb04fb3b..d5a7511d5f 100644 --- a/client/src/app/site/modules/user-components/components/user-multiselect-actions/user-multiselect-actions.component.html +++ b/client/src/app/site/modules/user-components/components/user-multiselect-actions/user-multiselect-actions.component.html @@ -3,12 +3,12 @@ {{ 'Select all' | translate }} - -@if (canUpdate) { +@if (canUpdate()) { - @if (motion.getPersonalNote()?.star) { - - star - - } - - @if (motion.hasAttachments()) { - - attach_file - - } - - +

+ + + @if (motion.getPersonalNote()?.star) { + + star + + } + + @if (motion.hasAttachments()) { + + attach_file + + } + @if (vp.isMobile && motion.number) { {{ motion.number }} @@ -146,7 +146,7 @@

} {{ motion.title }} - +

diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.scss index 285b9c8a53..d9f24b005e 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.scss @@ -17,6 +17,7 @@ $text-margin-top: 10px; .column-title { margin-top: $text-margin-top; + & h1 { font-family: typography.$font-family; padding-bottom: 0%; @@ -40,6 +41,7 @@ os-grid-layout { width: 100%; padding: 0 8px; } + .tile-block-title { font-size: 36px; @@ -112,3 +114,7 @@ os-grid-layout { .non-overflowing-chip { max-width: calc(100% - 20px); } + +h1 a { + color: inherit; +} diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.ts index 4a05c1a1c7..f84d934602 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.ts @@ -1,11 +1,9 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, inject, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom, map } from 'rxjs'; import { OsFilterOptionCondition } from 'src/app/site/base/base-filter.service'; import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; import { ViewMotionCategory, ViewMotionState } from 'src/app/site/pages/meetings/pages/motions'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { ViewPortService } from 'src/app/site/services/view-port.service'; import { GridBlockTileType } from 'src/app/ui/modules/grid'; @@ -48,6 +46,19 @@ interface TileCategoryInformation { export class MotionListComponent extends BaseMeetingListViewComponent implements OnInit { public readonly gridBlockType = GridBlockTileType; + /** + * Define extra filter properties + */ + public filterProps = [ + `submitters`, + `additional_submitter`, + `block`, + `title`, + `number`, + `getExtendedStateLabel`, + `getExtendedRecommendationLabel` + ]; + /** * String to define the current selected view. */ @@ -58,35 +69,12 @@ export class MotionListComponent extends BaseMeetingListViewComponent Date: Tue, 30 Jun 2026 11:14:27 +0200 Subject: [PATCH 16/71] Set timezone after initTimezones in meeting-edit (#6342) --- .../meeting-edit/meeting-edit.component.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.ts index fac2a89218..e9a3dcf8df 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.ts @@ -170,7 +170,18 @@ export class MeetingEditComponent extends BaseComponent implements OnInit { } private async initTimezones(): Promise { - this.timeZone.getTZForSearchSelector().then(values => this.time_zones.next(values)); + this.timeZone.getTZForSearchSelector().then(values => { + this.time_zones.next(values); + this.patchTimezoneInForm(); + }); + } + + private patchTimezoneInForm(): void { + if (!this.meetingForm?.get('time_zone').value) { + this.meetingForm + .get('time_zone') + .setValue(this.timeZone.getTimezoneIdByName(this.timeZone.getOrganizationTimeZone())); + } } public getAdditionallySearchedValuesFn(item: Selectable): string[] { From d27635a7a01a67ef04c63a700f4b8cf344cdeef2 Mon Sep 17 00:00:00 2001 From: Loki Elble <69210919+Elblinator@users.noreply.github.com> Date: Wed, 1 Jul 2026 08:36:31 +0200 Subject: [PATCH 17/71] Add aria label to motion/amendment/reason-text (#6333) --- .../motion-content.component.html | 59 +++++++++++-------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.html index ea671646d2..9abdf193ff 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.html @@ -9,7 +9,10 @@ } @if (lineNumberingMode === LineNumberingMode.Outside && changeRecoMode === ChangeRecoMode.Original) { -
+
} @else { - +
+ +
} } @else { - + +
+ } +} @else { + +
+ - } -} @else { - - +
}
@if (showReason) {
-

{{ 'Reason' | translate }}

+

{{ 'Reason text' | translate }}

} From d47fdfa5f57f1560700b891d8f9c1b834acbbd40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2026 08:47:20 +0200 Subject: [PATCH 18/71] Bump the angular group in /client with 2 updates (#6335) --- client/package-lock.json | 789 +++++++++++++++++++++++++++++++++------ client/package.json | 4 +- 2 files changed, 673 insertions(+), 120 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 9f5a5308ef..26802f66ba 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -80,8 +80,8 @@ "@angular-eslint/eslint-plugin-template": "^21.4.0", "@angular-eslint/schematics": "^21.4.0", "@angular-eslint/template-parser": "^21.3.0", - "@angular/build": "^21.2.16", - "@angular/cli": "^21.2.16", + "@angular/build": "^21.2.17", + "@angular/cli": "^21.2.17", "@angular/compiler-cli": "^21.2.17", "@angular/language-server": "^21.2.17", "@coreui/angular-chartjs": "^5.6.24", @@ -362,13 +362,13 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.2102.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2102.16.tgz", - "integrity": "sha512-FDUKPpq70nJwGK4CICPD31XmesBEGv57Z+JBCPWrTa5mVZIXCQkeo5waIaNfzAnLdbpd74ULJJ3MDNVt4iaGZg==", + "version": "0.2102.17", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2102.17.tgz", + "integrity": "sha512-+lkmpEfKXuPZaGZRCCT/B2JGSnafudEVMLeolAW0G7de28bwJIwTE5nmr/rcKTy4NnEDX/8B53tWTXGENuQvmg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "21.2.16", + "@angular-devkit/core": "21.2.17", "rxjs": "7.8.2" }, "bin": { @@ -381,9 +381,9 @@ } }, "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": { - "version": "21.2.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.16.tgz", - "integrity": "sha512-bRot0dqonxdSuGzXyOYtVJis/u9CJycrfC/aaxLeMF37gKtWIyCR2KFkMRXAoiV/AKk5/NuuqDNqcQS9w5G3Fg==", + "version": "21.2.17", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.17.tgz", + "integrity": "sha512-JbGWwFX1Nv4Np0S9b4HP2SUKhR2bz6l/S8zBXnam95+RXzDaqXJDmQHOHZGS+4La06SjlcXwFyrgSI0rm50A1A==", "dev": true, "license": "MIT", "dependencies": { @@ -409,13 +409,13 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "21.2.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-21.2.16.tgz", - "integrity": "sha512-3wTn2N6iWxYLrRaFDk3J3a6P3OxL+yvYGoDA7pNKfI+Nu0PpTK8BBwhNQD8L5P3US/QGWTkMNbzZ7XxBBfFP/g==", + "version": "21.2.17", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-21.2.17.tgz", + "integrity": "sha512-IMsbo/OBG0mdCRxezbq/CLo6JxUJBOAHZfbUDzxbSRwJm8FT5AbXO7rW+Z3haoqcb+WrC5Pr+DQ6WolX2x2brQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "21.2.16", + "@angular-devkit/core": "21.2.17", "jsonc-parser": "3.3.1", "magic-string": "0.30.21", "ora": "9.3.0", @@ -428,9 +428,9 @@ } }, "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": { - "version": "21.2.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.16.tgz", - "integrity": "sha512-bRot0dqonxdSuGzXyOYtVJis/u9CJycrfC/aaxLeMF37gKtWIyCR2KFkMRXAoiV/AKk5/NuuqDNqcQS9w5G3Fg==", + "version": "21.2.17", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.17.tgz", + "integrity": "sha512-JbGWwFX1Nv4Np0S9b4HP2SUKhR2bz6l/S8zBXnam95+RXzDaqXJDmQHOHZGS+4La06SjlcXwFyrgSI0rm50A1A==", "dev": true, "license": "MIT", "dependencies": { @@ -685,22 +685,22 @@ } }, "node_modules/@angular/build": { - "version": "21.2.16", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-21.2.16.tgz", - "integrity": "sha512-40Ra2lM/KDPwA68wP6ZX7zVQak/ouo1sTmtUmjUpqihDp5ftXAZWD3t2Mm4Ja88cyHzG3kaI3C0ew/wAdcEeDA==", + "version": "21.2.17", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-21.2.17.tgz", + "integrity": "sha512-1tKQoRH8/21lf3Z1+ezaHmzdhAmeJx34wVW69DU+NuumsjDHDuq2YdUbiC936SnI33tDXov5UOBMqzjHe8qUTg==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.2102.16", - "@babel/core": "7.29.0", + "@angular-devkit/architect": "0.2102.17", + "@babel/core": "7.29.7", "@babel/helper-annotate-as-pure": "7.27.3", "@babel/helper-split-export-declaration": "7.24.7", "@inquirer/confirm": "5.1.21", "@vitejs/plugin-basic-ssl": "2.1.4", "beasties": "0.4.1", "browserslist": "^4.26.0", - "esbuild": "0.27.3", + "esbuild": "0.28.1", "https-proxy-agent": "7.0.6", "istanbul-lib-instrument": "6.0.3", "jsonc-parser": "3.3.1", @@ -709,14 +709,14 @@ "mrmime": "2.0.1", "parse5-html-rewriting-stream": "8.0.0", "picomatch": "4.0.4", - "piscina": "5.1.4", + "piscina": "5.2.0", "rolldown": "1.0.0-rc.4", "sass": "1.97.3", "semver": "7.7.4", "source-map-support": "0.5.21", "tinyglobby": "0.2.15", "undici": "7.24.4", - "vite": "7.3.2", + "vite": "7.3.5", "watchpack": "2.5.1" }, "engines": { @@ -735,7 +735,7 @@ "@angular/platform-browser": "^21.0.0", "@angular/platform-server": "^21.0.0", "@angular/service-worker": "^21.0.0", - "@angular/ssr": "^21.2.16", + "@angular/ssr": "^21.2.17", "karma": "^6.4.0", "less": "^4.2.0", "ng-packagr": "^21.0.0", @@ -784,6 +784,538 @@ } } }, + "node_modules/@angular/build/node_modules/@babel/core": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz", + "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.29.7", + "@babel/generator": "^7.29.7", + "@babel/helper-compilation-targets": "^7.29.7", + "@babel/helper-module-transforms": "^7.29.7", + "@babel/helpers": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/template": "^7.29.7", + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7", + "@jridgewell/remapping": "^2.3.5", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@angular/build/node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/aix-ppc64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz", + "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/android-arm": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz", + "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/android-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz", + "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/android-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz", + "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/darwin-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz", + "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/darwin-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz", + "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/freebsd-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz", + "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/freebsd-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz", + "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-arm": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz", + "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz", + "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-ia32": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz", + "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-loong64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz", + "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-mips64el": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz", + "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-ppc64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz", + "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-riscv64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz", + "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-s390x": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz", + "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/linux-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz", + "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/netbsd-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz", + "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/netbsd-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz", + "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/openbsd-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz", + "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/openbsd-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz", + "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/openharmony-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz", + "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/sunos-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz", + "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/win32-arm64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz", + "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/win32-ia32": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz", + "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/@esbuild/win32-x64": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz", + "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@angular/build/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@angular/build/node_modules/esbuild": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz", + "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.28.1", + "@esbuild/android-arm": "0.28.1", + "@esbuild/android-arm64": "0.28.1", + "@esbuild/android-x64": "0.28.1", + "@esbuild/darwin-arm64": "0.28.1", + "@esbuild/darwin-x64": "0.28.1", + "@esbuild/freebsd-arm64": "0.28.1", + "@esbuild/freebsd-x64": "0.28.1", + "@esbuild/linux-arm": "0.28.1", + "@esbuild/linux-arm64": "0.28.1", + "@esbuild/linux-ia32": "0.28.1", + "@esbuild/linux-loong64": "0.28.1", + "@esbuild/linux-mips64el": "0.28.1", + "@esbuild/linux-ppc64": "0.28.1", + "@esbuild/linux-riscv64": "0.28.1", + "@esbuild/linux-s390x": "0.28.1", + "@esbuild/linux-x64": "0.28.1", + "@esbuild/netbsd-arm64": "0.28.1", + "@esbuild/netbsd-x64": "0.28.1", + "@esbuild/openbsd-arm64": "0.28.1", + "@esbuild/openbsd-x64": "0.28.1", + "@esbuild/openharmony-arm64": "0.28.1", + "@esbuild/sunos-x64": "0.28.1", + "@esbuild/win32-arm64": "0.28.1", + "@esbuild/win32-ia32": "0.28.1", + "@esbuild/win32-x64": "0.28.1" + } + }, "node_modules/@angular/cdk": { "version": "21.2.14", "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-21.2.14.tgz", @@ -801,19 +1333,19 @@ } }, "node_modules/@angular/cli": { - "version": "21.2.16", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-21.2.16.tgz", - "integrity": "sha512-/O2Bsy4jae/op06ejyfsL6K4cD4yo7TEH9iesD4UPEvcWTnV8lCdmE2oxbc1WGT3DIsZ00yBQhURSbetDPGFCg==", + "version": "21.2.17", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-21.2.17.tgz", + "integrity": "sha512-wyEPOszxza7kUa1BWyERUqSDmAC/DF5Iun0YJ1sN22jDriOuOlYh9hXSk1EHs06fQ1JcTYLml+timHVHg4V1/w==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.2102.16", - "@angular-devkit/core": "21.2.16", - "@angular-devkit/schematics": "21.2.16", + "@angular-devkit/architect": "0.2102.17", + "@angular-devkit/core": "21.2.17", + "@angular-devkit/schematics": "21.2.17", "@inquirer/prompts": "7.10.1", "@listr2/prompt-adapter-inquirer": "3.0.5", "@modelcontextprotocol/sdk": "1.26.0", - "@schematics/angular": "21.2.16", + "@schematics/angular": "21.2.17", "@yarnpkg/lockfile": "1.1.0", "algoliasearch": "5.48.1", "ini": "6.0.0", @@ -836,9 +1368,9 @@ } }, "node_modules/@angular/cli/node_modules/@angular-devkit/core": { - "version": "21.2.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.16.tgz", - "integrity": "sha512-bRot0dqonxdSuGzXyOYtVJis/u9CJycrfC/aaxLeMF37gKtWIyCR2KFkMRXAoiV/AKk5/NuuqDNqcQS9w5G3Fg==", + "version": "21.2.17", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.17.tgz", + "integrity": "sha512-JbGWwFX1Nv4Np0S9b4HP2SUKhR2bz6l/S8zBXnam95+RXzDaqXJDmQHOHZGS+4La06SjlcXwFyrgSI0rm50A1A==", "dev": true, "license": "MIT", "dependencies": { @@ -1134,13 +1666,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", - "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", + "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.28.5", + "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" }, @@ -1149,9 +1681,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz", - "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz", + "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==", "dev": true, "license": "MIT", "engines": { @@ -1207,14 +1739,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.29.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz", - "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz", + "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.29.0", - "@babel/types": "^7.29.0", + "@babel/parser": "^7.29.7", + "@babel/types": "^7.29.7", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -1237,14 +1769,14 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz", - "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz", + "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.28.6", - "@babel/helper-validator-option": "^7.27.1", + "@babel/compat-data": "^7.29.7", + "@babel/helper-validator-option": "^7.29.7", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -1264,9 +1796,9 @@ } }, "node_modules/@babel/helper-globals": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", - "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz", + "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==", "dev": true, "license": "MIT", "engines": { @@ -1274,29 +1806,29 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz", - "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz", + "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz", - "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz", + "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.28.6", - "@babel/helper-validator-identifier": "^7.28.5", - "@babel/traverse": "^7.28.6" + "@babel/helper-module-imports": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1319,9 +1851,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", - "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", + "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", "dev": true, "license": "MIT", "engines": { @@ -1329,9 +1861,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", - "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", "dev": true, "license": "MIT", "engines": { @@ -1339,9 +1871,9 @@ } }, "node_modules/@babel/helper-validator-option": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", - "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz", + "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==", "dev": true, "license": "MIT", "engines": { @@ -1349,27 +1881,27 @@ } }, "node_modules/@babel/helpers": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz", - "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz", + "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/template": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz", - "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz", + "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.29.0" + "@babel/types": "^7.29.7" }, "bin": { "parser": "bin/babel-parser.js" @@ -1388,33 +1920,33 @@ } }, "node_modules/@babel/template": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz", - "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz", + "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.28.6", - "@babel/parser": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/code-frame": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz", - "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz", + "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.29.0", - "@babel/generator": "^7.29.0", - "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.29.0", - "@babel/template": "^7.28.6", - "@babel/types": "^7.29.0", + "@babel/code-frame": "^7.29.7", + "@babel/generator": "^7.29.7", + "@babel/helper-globals": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/template": "^7.29.7", + "@babel/types": "^7.29.7", "debug": "^4.3.1" }, "engines": { @@ -1422,14 +1954,14 @@ } }, "node_modules/@babel/types": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", - "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", + "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.28.5" + "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -3277,6 +3809,9 @@ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -3294,6 +3829,9 @@ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -3311,6 +3849,9 @@ "ppc64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -3328,6 +3869,9 @@ "riscv64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -3345,6 +3889,9 @@ "s390x" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -3362,6 +3909,9 @@ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -3379,6 +3929,9 @@ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -4716,14 +5269,14 @@ ] }, "node_modules/@schematics/angular": { - "version": "21.2.16", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-21.2.16.tgz", - "integrity": "sha512-ctvsRartACu77VAM416VlNV3mag7FhU08I/734f4+sS/UZmnhuTM5a4tTTWEI1U7iPeJoBtjreh6LgeP+QZLbQ==", + "version": "21.2.17", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-21.2.17.tgz", + "integrity": "sha512-rKHz2//1S3j4MKfsRDtJjnNoCfqSj2dNJDN27pLT9h4oLfBs2wJinfRTQywo2fVGdUcDd+mXBnltqdLJlcoFNw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "21.2.16", - "@angular-devkit/schematics": "21.2.16", + "@angular-devkit/core": "21.2.17", + "@angular-devkit/schematics": "21.2.17", "jsonc-parser": "3.3.1" }, "engines": { @@ -4733,9 +5286,9 @@ } }, "node_modules/@schematics/angular/node_modules/@angular-devkit/core": { - "version": "21.2.16", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.16.tgz", - "integrity": "sha512-bRot0dqonxdSuGzXyOYtVJis/u9CJycrfC/aaxLeMF37gKtWIyCR2KFkMRXAoiV/AKk5/NuuqDNqcQS9w5G3Fg==", + "version": "21.2.17", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.17.tgz", + "integrity": "sha512-JbGWwFX1Nv4Np0S9b4HP2SUKhR2bz6l/S8zBXnam95+RXzDaqXJDmQHOHZGS+4La06SjlcXwFyrgSI0rm50A1A==", "dev": true, "license": "MIT", "dependencies": { @@ -12846,9 +13399,9 @@ } }, "node_modules/piscina": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/piscina/-/piscina-5.1.4.tgz", - "integrity": "sha512-7uU4ZnKeQq22t9AsmHGD2w4OYQGonwFnTypDypaWi7Qr2EvQIFVtG8J5D/3bE7W123Wdc9+v4CZDu5hJXVCtBg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/piscina/-/piscina-5.2.0.tgz", + "integrity": "sha512-DszUCKeVN/5G5QKo6jAVHL8fmKnkJvQ0ACiVgY7YGCq3TUB2oznAOayvZPIAdEThvhczkXR+qm3IHsNXpFCYfA==", "dev": true, "license": "MIT", "engines": { @@ -15109,9 +15662,9 @@ } }, "node_modules/vite": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.2.tgz", - "integrity": "sha512-Bby3NOsna2jsjfLVOHKes8sGwgl4TT0E6vvpYgnAYDIF/tie7MRaFthmKuHx1NSXjiTueXH3do80FMQgvEktRg==", + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.5.tgz", + "integrity": "sha512-KuOaNhcnGFN2zIPGA7wRmzF+lJA1sea7rHq17aiJ++9lzY1WWG6Jpwqwe1KNbRVPIqHmr8GLYx7jbrQcN/7/ww==", "dev": true, "license": "MIT", "dependencies": { diff --git a/client/package.json b/client/package.json index 12787a4075..ca49e670ef 100644 --- a/client/package.json +++ b/client/package.json @@ -103,8 +103,8 @@ "@angular-eslint/eslint-plugin-template": "^21.4.0", "@angular-eslint/schematics": "^21.4.0", "@angular-eslint/template-parser": "^21.3.0", - "@angular/build": "^21.2.16", - "@angular/cli": "^21.2.16", + "@angular/build": "^21.2.17", + "@angular/cli": "^21.2.17", "@angular/compiler-cli": "^21.2.17", "@angular/language-server": "^21.2.17", "@coreui/angular-chartjs": "^5.6.24", From 8352e857287c7f566bdb464ee01dae73500b1944 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2026 08:47:48 +0200 Subject: [PATCH 19/71] Bump playwright from v1.61.0-jammy to v1.61.1-jammy in /client/tests (#6336) --- client/tests/Dockerfile.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/tests/Dockerfile.test b/client/tests/Dockerfile.test index c138b8dfa2..22a9f2f377 100644 --- a/client/tests/Dockerfile.test +++ b/client/tests/Dockerfile.test @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/playwright:v1.61.0-jammy +FROM mcr.microsoft.com/playwright:v1.61.1-jammy WORKDIR /app COPY ./package.json . From e30f953959825ee80c54f70460c9ddb5dc0ee272 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2026 08:48:02 +0200 Subject: [PATCH 20/71] Bump @playwright/test from 1.61.0 to 1.61.1 in /client/tests (#6337) --- client/tests/package-lock.json | 24 ++++++++++++------------ client/tests/package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/tests/package-lock.json b/client/tests/package-lock.json index d27342e766..681cf0dab3 100644 --- a/client/tests/package-lock.json +++ b/client/tests/package-lock.json @@ -5,17 +5,17 @@ "packages": { "": { "devDependencies": { - "@playwright/test": "^1.61.0" + "@playwright/test": "^1.61.1" } }, "node_modules/@playwright/test": { - "version": "1.61.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.61.0.tgz", - "integrity": "sha512-cKA5B6lpFEMyMGjxF54QihfYpB4FkEGH+qZhtArDEG+wezQAJY8Pq6C7T1SjWz+FFzt3TbyoXBQYk/0292TdJA==", + "version": "1.61.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.61.1.tgz", + "integrity": "sha512-8nKv6+0RJSL9FE4jYOEGXnPeM/Hg12qZpmqzZjRh3qM0Y7c3z1mrOTfFLids72RDQYVh9WpLEfR5WdpNX4fkig==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.61.0" + "playwright": "1.61.1" }, "bin": { "playwright": "cli.js" @@ -40,13 +40,13 @@ } }, "node_modules/playwright": { - "version": "1.61.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.61.0.tgz", - "integrity": "sha512-Z+7BeeqQPRRzklHsVFP4KTGIyMxKUmfeRA4WisM6G3/XW6nwGeX6fX9qYaDa+CiUqpOkb2f6X3nar05R3kSuJQ==", + "version": "1.61.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.61.1.tgz", + "integrity": "sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.61.0" + "playwright-core": "1.61.1" }, "bin": { "playwright": "cli.js" @@ -59,9 +59,9 @@ } }, "node_modules/playwright-core": { - "version": "1.61.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.61.0.tgz", - "integrity": "sha512-caX7TrY3Ml6egyDX0WUcTHDxodl/b51y5wJOdCEA36QviK/s2g081hvmGs8eaE3DWb6NYZQ6BjO/QkNRPenoPA==", + "version": "1.61.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.61.1.tgz", + "integrity": "sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/client/tests/package.json b/client/tests/package.json index 53b431def9..89e5db5807 100644 --- a/client/tests/package.json +++ b/client/tests/package.json @@ -1,6 +1,6 @@ { "scripts": {}, "devDependencies": { - "@playwright/test": "^1.61.0" + "@playwright/test": "^1.61.1" } } From 648ebd708d69a3bb5d66204a940262de290dc9fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2026 08:48:24 +0200 Subject: [PATCH 21/71] Bump video.js from 8.23.8 to 8.23.9 in /client (#6339) --- client/package-lock.json | 38 +++++++++++++++++++------------------- client/package.json | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 26802f66ba..955f4289e9 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -71,7 +71,7 @@ "qrcode": "^1.5.4", "rxjs": "^7.8.2", "tinycolor2": "1.6.0", - "video.js": "^8.23.8", + "video.js": "^8.23.9", "zone.js": "^0.16.1" }, "devDependencies": { @@ -7316,17 +7316,17 @@ } }, "node_modules/@videojs/http-streaming": { - "version": "3.17.4", - "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.17.4.tgz", - "integrity": "sha512-XAvdG2dolBuV2Fx8bu1kjmQ2D4TonGzZH68Pgv/O9xMSFWdZtITSMFismeQLEAtMmGwze8qNJp3RgV+jStrJqg==", + "version": "3.17.5", + "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.17.5.tgz", + "integrity": "sha512-PRRQVu0hYW5h0XvRWpIyIpEatpMZzZtf7L1avV89Hnu+69f+0c7oLsSL9jwpg2nbvzGkdX5rQxQkz5Vc7tFR9w==", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.12.5", - "@videojs/vhs-utils": "^4.1.1", + "@videojs/vhs-utils": "^4.1.2", "aes-decrypter": "^4.0.2", "global": "^4.4.0", "m3u8-parser": "^7.2.0", - "mpd-parser": "^1.3.1", + "mpd-parser": "^1.4.0", "mux.js": "7.1.0", "video.js": "^7 || ^8" }, @@ -7339,9 +7339,9 @@ } }, "node_modules/@videojs/vhs-utils": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-4.1.1.tgz", - "integrity": "sha512-5iLX6sR2ownbv4Mtejw6Ax+naosGvoT9kY+gcuHzANyUZZ+4NpeNdKMUhb6ag0acYej1Y7cmr/F2+4PrggMiVA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-4.1.2.tgz", + "integrity": "sha512-1Dsv5dtWOq0LP1G37O46FQFA2tKAZON5UMe6dFPxT7JvPhEx8QIXcFQxan8+hHI3fX6aomFRFrUBJNgRYQDSXA==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.12.5", @@ -12496,13 +12496,13 @@ } }, "node_modules/mpd-parser": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-1.3.1.tgz", - "integrity": "sha512-1FuyEWI5k2HcmhS1HkKnUAQV7yFPfXPht2DnRRGtoiiAAW+ESTbtEXIDpRkwdU+XyrQuwrIym7UkoPKsZ0SyFw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-1.4.0.tgz", + "integrity": "sha512-blbA7XpAaOdC/PR0Tu8GiUxlx6CpBuRowQPYV7lhi9Yr9G9+dkPXIUjqjzc/NCn/uZZPopluaJlIYntIEI/VLw==", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.12.5", - "@videojs/vhs-utils": "^4.0.0", + "@videojs/vhs-utils": "^4.1.2", "@xmldom/xmldom": "^0.8.3", "global": "^4.4.0" }, @@ -15611,19 +15611,19 @@ } }, "node_modules/video.js": { - "version": "8.23.8", - "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.23.8.tgz", - "integrity": "sha512-plZuWxN4clhDESSpi3QLYVs6tgnnf9qT9SA4iahHwZEmdVSuUh4+O6vQPcA5XqiEDvjeBDJvLafH1bhkAXaXKQ==", + "version": "8.23.9", + "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.23.9.tgz", + "integrity": "sha512-3UCqyFW4wIusQu4TuhgRUxqtbzbj0WPT9hps0XIEXST43QBD11zb+bG7tBPrinrZztwVYdXCiOBo2pcGj9L05w==", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.28.4", - "@videojs/http-streaming": "^3.17.4", - "@videojs/vhs-utils": "^4.1.1", + "@videojs/http-streaming": "^3.17.5", + "@videojs/vhs-utils": "^4.1.2", "@videojs/xhr": "2.7.0", "aes-decrypter": "^4.0.2", "global": "4.4.0", "m3u8-parser": "^7.2.0", - "mpd-parser": "^1.3.1", + "mpd-parser": "^1.4.0", "mux.js": "^7.0.1", "videojs-contrib-quality-levels": "4.1.0", "videojs-font": "4.2.0", diff --git a/client/package.json b/client/package.json index ca49e670ef..c13ca646ba 100644 --- a/client/package.json +++ b/client/package.json @@ -94,7 +94,7 @@ "qrcode": "^1.5.4", "rxjs": "^7.8.2", "tinycolor2": "1.6.0", - "video.js": "^8.23.8", + "video.js": "^8.23.9", "zone.js": "^0.16.1" }, "devDependencies": { From 0560440cdb428424508766b85df4d43f14bff138 Mon Sep 17 00:00:00 2001 From: Loki Elble <69210919+Elblinator@users.noreply.github.com> Date: Thu, 2 Jul 2026 08:37:16 +0200 Subject: [PATCH 22/71] Add translatioon marker for is not locked out (#6346) --- .../participant-list-filter.service.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.ts index 35fdcf25f0..a7eef1e187 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.ts @@ -124,10 +124,10 @@ export class ParticipantListFilterService extends BaseFilterListService Date: Thu, 2 Jul 2026 12:04:56 +0200 Subject: [PATCH 23/71] Bump typescript-eslint from 8.61.1 to 8.62.0 in /client (#6340) --- client/package-lock.json | 547 ++------------------------------------- client/package.json | 2 +- 2 files changed, 16 insertions(+), 533 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 955f4289e9..3e088344ff 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -117,7 +117,7 @@ "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.61.1" + "typescript-eslint": "^8.62.0" } }, "../packages/openslides-motion-diff": { @@ -6647,160 +6647,6 @@ "typescript": ">=4.8.4 <6.1.0" } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/project-service": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.0.tgz", - "integrity": "sha512-wexnCqiTg7BOGtbLDftYpRWlmLq4xfoMd7BKFR6Y75sZS3QmRKLdN3yWLhmIYgqMmP/OXWpj3H8odkb5nGURCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.62.0", - "@typescript-eslint/types": "^8.62.0", - "debug": "^4.4.3" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.0.tgz", - "integrity": "sha512-1lX38kNxXIRb8mEc3lbq5mdHq1Pf2+U0nFU65KfT18mtPxxl0fvjuEE92mHuXPuCtElJhOrddOpyMlM3Z0umEA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.62.0", - "@typescript-eslint/visitor-keys": "8.62.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.0.tgz", - "integrity": "sha512-y2GAdB6ykaXUvuspbYnizQc4oDDz0Tz/Yc7iWrXf9mx8vm/L/0vLHCe0tS2boG96Zy+DivnVDQ9ZUEWoHqqx1g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz", - "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.0.tgz", - "integrity": "sha512-+hVbNxtW64pIcZWDPGbyaKF7vp2IBTVY5ma1blwwksrjdsbdqqEKvJWMGbBofei4F6Dovx1M0RJgoFeNu2279A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/project-service": "8.62.0", - "@typescript-eslint/tsconfig-utils": "8.62.0", - "@typescript-eslint/types": "8.62.0", - "@typescript-eslint/visitor-keys": "8.62.0", - "debug": "^4.4.3", - "minimatch": "^10.2.2", - "semver": "^7.7.3", - "tinyglobby": "^0.2.15", - "ts-api-utils": "^2.5.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.0.tgz", - "integrity": "sha512-82r66fi9zYwZ+mTq3vKgwjbZ1PVk/DJzrXFLpG6RnBbdvH8TEGVHIs9H4d2drhkOzf0syZuD/OZvvlu6GDbP4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.62.0", - "@typescript-eslint/types": "8.62.0", - "@typescript-eslint/typescript-estree": "8.62.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.0.tgz", - "integrity": "sha512-CY3uyFSRbcQv3nnSv8S0+lDftMVz6P963PoRlxrV7ew/Md564g9ut60PYzdLM5qW4jFn93GBF+Soi90ISAN+GQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.62.0", - "eslint-visitor-keys": "^5.0.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", - "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^20.19.0 || ^22.13.0 || >=24" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/@typescript-eslint/parser": { "version": "8.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.0.tgz", @@ -6826,7 +6672,7 @@ "typescript": ">=4.8.4 <6.1.0" } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/project-service": { + "node_modules/@typescript-eslint/project-service": { "version": "8.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.0.tgz", "integrity": "sha512-wexnCqiTg7BOGtbLDftYpRWlmLq4xfoMd7BKFR6Y75sZS3QmRKLdN3yWLhmIYgqMmP/OXWpj3H8odkb5nGURCQ==", @@ -6848,7 +6694,7 @@ "typescript": ">=4.8.4 <6.1.0" } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { + "node_modules/@typescript-eslint/scope-manager": { "version": "8.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.0.tgz", "integrity": "sha512-1lX38kNxXIRb8mEc3lbq5mdHq1Pf2+U0nFU65KfT18mtPxxl0fvjuEE92mHuXPuCtElJhOrddOpyMlM3Z0umEA==", @@ -6866,7 +6712,7 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/tsconfig-utils": { + "node_modules/@typescript-eslint/tsconfig-utils": { "version": "8.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.0.tgz", "integrity": "sha512-y2GAdB6ykaXUvuspbYnizQc4oDDz0Tz/Yc7iWrXf9mx8vm/L/0vLHCe0tS2boG96Zy+DivnVDQ9ZUEWoHqqx1g==", @@ -6883,136 +6729,6 @@ "typescript": ">=4.8.4 <6.1.0" } }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz", - "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.0.tgz", - "integrity": "sha512-+hVbNxtW64pIcZWDPGbyaKF7vp2IBTVY5ma1blwwksrjdsbdqqEKvJWMGbBofei4F6Dovx1M0RJgoFeNu2279A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/project-service": "8.62.0", - "@typescript-eslint/tsconfig-utils": "8.62.0", - "@typescript-eslint/types": "8.62.0", - "@typescript-eslint/visitor-keys": "8.62.0", - "debug": "^4.4.3", - "minimatch": "^10.2.2", - "semver": "^7.7.3", - "tinyglobby": "^0.2.15", - "ts-api-utils": "^2.5.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.0.tgz", - "integrity": "sha512-CY3uyFSRbcQv3nnSv8S0+lDftMVz6P963PoRlxrV7ew/Md564g9ut60PYzdLM5qW4jFn93GBF+Soi90ISAN+GQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.62.0", - "eslint-visitor-keys": "^5.0.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", - "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^20.19.0 || ^22.13.0 || >=24" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@typescript-eslint/project-service": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.61.1.tgz", - "integrity": "sha512-PrC4JYGmR241lYnfhmKGTXkFqv8+ymbTFgSAY0fVXpY82/QkMw5TZPl+vGzuDDU2QYJk9fIDOBTntF+yDv9LEA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.61.1", - "@typescript-eslint/types": "^8.61.1", - "debug": "^4.4.3" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.61.1.tgz", - "integrity": "sha512-L2bdIeoQS8FlKAvONAr20w6OcLXeB+qiDKbAooS9A0Ben+iSIkBef0FxqwKWYqt5sa0i4KJtxVyVmhMylKzF5w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.61.1", - "@typescript-eslint/visitor-keys": "8.61.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.1.tgz", - "integrity": "sha512-UN/H4di+OO7EWx2ovME+8t31YO+KVnK0RRKEHR3kOt21/Ay8BOq3M1OMvWs5vNiqcFCYGYoxK3MXPZzmMUE+yg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.1.0" - } - }, "node_modules/@typescript-eslint/type-utils": { "version": "8.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.62.0.tgz", @@ -7038,64 +6754,7 @@ "typescript": ">=4.8.4 <6.1.0" } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/project-service": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.0.tgz", - "integrity": "sha512-wexnCqiTg7BOGtbLDftYpRWlmLq4xfoMd7BKFR6Y75sZS3QmRKLdN3yWLhmIYgqMmP/OXWpj3H8odkb5nGURCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.62.0", - "@typescript-eslint/types": "^8.62.0", - "debug": "^4.4.3" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.0.tgz", - "integrity": "sha512-1lX38kNxXIRb8mEc3lbq5mdHq1Pf2+U0nFU65KfT18mtPxxl0fvjuEE92mHuXPuCtElJhOrddOpyMlM3Z0umEA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.62.0", - "@typescript-eslint/visitor-keys": "8.62.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.0.tgz", - "integrity": "sha512-y2GAdB6ykaXUvuspbYnizQc4oDDz0Tz/Yc7iWrXf9mx8vm/L/0vLHCe0tS2boG96Zy+DivnVDQ9ZUEWoHqqx1g==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": { + "node_modules/@typescript-eslint/types": { "version": "8.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz", "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==", @@ -7109,7 +6768,7 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": { + "node_modules/@typescript-eslint/typescript-estree": { "version": "8.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.0.tgz", "integrity": "sha512-+hVbNxtW64pIcZWDPGbyaKF7vp2IBTVY5ma1blwwksrjdsbdqqEKvJWMGbBofei4F6Dovx1M0RJgoFeNu2279A==", @@ -7137,7 +6796,7 @@ "typescript": ">=4.8.4 <6.1.0" } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": { + "node_modules/@typescript-eslint/utils": { "version": "8.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.0.tgz", "integrity": "sha512-82r66fi9zYwZ+mTq3vKgwjbZ1PVk/DJzrXFLpG6RnBbdvH8TEGVHIs9H4d2drhkOzf0syZuD/OZvvlu6GDbP4g==", @@ -7161,7 +6820,7 @@ "typescript": ">=4.8.4 <6.1.0" } }, - "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": { + "node_modules/@typescript-eslint/visitor-keys": { "version": "8.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.0.tgz", "integrity": "sha512-CY3uyFSRbcQv3nnSv8S0+lDftMVz6P963PoRlxrV7ew/Md564g9ut60PYzdLM5qW4jFn93GBF+Soi90ISAN+GQ==", @@ -7179,103 +6838,6 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", - "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^20.19.0 || ^22.13.0 || >=24" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@typescript-eslint/types": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.61.1.tgz", - "integrity": "sha512-G+CRlPqLv7Bz1IZVs03x5K59F1veqL0EJUROAdGhKsEq8qOiRiZbI+HUojPq5l0fEGOKModD9br6lObhB8zkoA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.61.1.tgz", - "integrity": "sha512-u+oQD3BqYWPc8YV9Zab4vaJElJuwOLPRc10Jm1o/qS+6Qwen14HCWwx0Seo4LnSn2wxea2Ik8DxPt2/FHmuhrg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/project-service": "8.61.1", - "@typescript-eslint/tsconfig-utils": "8.61.1", - "@typescript-eslint/types": "8.61.1", - "@typescript-eslint/visitor-keys": "8.61.1", - "debug": "^4.4.3", - "minimatch": "^10.2.2", - "semver": "^7.7.3", - "tinyglobby": "^0.2.15", - "ts-api-utils": "^2.5.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/@typescript-eslint/utils": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.61.1.tgz", - "integrity": "sha512-1+P/3Dj6jvtybE1q0HQ6yBt/gq+oKJyLdEv4HdnqasaEXRSYCAsD59mXEVQnM/ULNdQxbX77tdG4jPRjIS6knA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.61.1", - "@typescript-eslint/types": "8.61.1", - "@typescript-eslint/typescript-estree": "8.61.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.1.tgz", - "integrity": "sha512-6fJ9MHWtK14C1DSkiMlHUSOmrVebL7150xZJBlJiL62jjhIA4JmOq6flwBgDxIdBKKdoiZRel+dfPD5MLfny3w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "8.61.1", - "eslint-visitor-keys": "^5.0.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", @@ -15267,95 +14829,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.61.1.tgz", - "integrity": "sha512-V7PayAfJokV3pEHgN7/v03D1SpujhRfQtYLbLIiBfDDncdg4PAiRBfoS4cnCANK4jmAPncczi59QO3afiXUlNw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/eslint-plugin": "8.61.1", - "@typescript-eslint/parser": "8.61.1", - "@typescript-eslint/typescript-estree": "8.61.1", - "@typescript-eslint/utils": "8.61.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/typescript-eslint/node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.1.tgz", - "integrity": "sha512-ZPlVl3PB3et/59Ne0fv/sci6ZXz4T4Hp4nTJ56i/Y0gR89ARb+KphojTq6j+56E5PIezmOIOOWyY+aWQFd+IkQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.61.1", - "@typescript-eslint/type-utils": "8.61.1", - "@typescript-eslint/utils": "8.61.1", - "@typescript-eslint/visitor-keys": "8.61.1", - "ignore": "^7.0.5", - "natural-compare": "^1.4.0", - "ts-api-utils": "^2.5.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^8.61.1", - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/typescript-eslint/node_modules/@typescript-eslint/parser": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.61.1.tgz", - "integrity": "sha512-PJ5vePq5/ognBbrIcoC5+SHO5dfpeLPzP9FpLkzWrguoYQEeeSjlJpVwOpo1JRSTEi7dRcwNy4h4dzV70PqHcg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/scope-manager": "8.61.1", - "@typescript-eslint/types": "8.61.1", - "@typescript-eslint/typescript-estree": "8.61.1", - "@typescript-eslint/visitor-keys": "8.61.1", - "debug": "^4.4.3" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.1.0" - } - }, - "node_modules/typescript-eslint/node_modules/@typescript-eslint/type-utils": { - "version": "8.61.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.61.1.tgz", - "integrity": "sha512-GYRicKmVK0C4fsKgaACaknOUAq9Oa2kwsjnpFhFcS/5p4Ht5IP9OVLbgIgcK4SRk92nVHFluurg1lumD9dBcLw==", + "version": "8.62.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.62.0.tgz", + "integrity": "sha512-8QxXi+ZACKX0kaqO4gY8kn0RSD9gFfaHDWwjqtEN48aWCBkX4MJaufWN+c3BzlrXLOxfywDL8CaoqUwcRq4j4Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.61.1", - "@typescript-eslint/typescript-estree": "8.61.1", - "@typescript-eslint/utils": "8.61.1", - "debug": "^4.4.3", - "ts-api-utils": "^2.5.0" + "@typescript-eslint/eslint-plugin": "8.62.0", + "@typescript-eslint/parser": "8.62.0", + "@typescript-eslint/typescript-estree": "8.62.0", + "@typescript-eslint/utils": "8.62.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" diff --git a/client/package.json b/client/package.json index c13ca646ba..6912dd214e 100644 --- a/client/package.json +++ b/client/package.json @@ -140,7 +140,7 @@ "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.61.1" + "typescript-eslint": "^8.62.0" }, "browser": { "fs": false From cee86aee361bf1a848b61d12a0d3ceaf090f6af9 Mon Sep 17 00:00:00 2001 From: Loki Elble <69210919+Elblinator@users.noreply.github.com> Date: Thu, 2 Jul 2026 15:15:49 +0200 Subject: [PATCH 24/71] Change new workflow tool tip (#6345) --- .../components/workflow-list/workflow-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-list/workflow-list.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-list/workflow-list.component.html index 43efbb798e..a05eb2859a 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-list/workflow-list.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-list/workflow-list.component.html @@ -1,6 +1,6 @@ Date: Fri, 3 Jul 2026 13:59:10 +0200 Subject: [PATCH 25/71] Update meta repository (#6332) --- meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta b/meta index d3b883cb27..7f0f4fe86d 160000 --- a/meta +++ b/meta @@ -1 +1 @@ -Subproject commit d3b883cb2777153dc9a99fc325d62b777be0f220 +Subproject commit 7f0f4fe86d179bc0bf07cecbcce508cec72922f6 From 8b827cb7893e244e4aefd5690564ea4a7053a3eb Mon Sep 17 00:00:00 2001 From: Loki Elble <69210919+Elblinator@users.noreply.github.com> Date: Mon, 6 Jul 2026 10:30:28 +0200 Subject: [PATCH 26/71] Orga settings (#6350) --- .../organization-settings.component.html | 6 +-- .../organization-settings.component.ts | 40 ++++++++++--------- .../base-search-selector.component.ts | 5 +++ 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.html b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.html index 5fa27082a1..cfd94e9d7f 100644 --- a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.html +++ b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.html @@ -43,7 +43,7 @@

{{ 'General' | translate }}

@@ -209,8 +209,8 @@

{{ 'Single Sign-On settings' | translate }}

{{ - 'Use JSON key:value structure (key = OpenSlides attribute name, value = IdP attribute name).' - | translate + 'Use JSON key:value structure (key = OpenSlides attribute name, value = IdP attribute + name).' | translate }} diff --git a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.ts b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.ts index 775b4c68c7..31276e66a1 100644 --- a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.ts +++ b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.ts @@ -1,8 +1,6 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component } from '@angular/core'; -import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, signal } from '@angular/core'; +import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { _ } from '@ngx-translate/core'; -import { TranslateService } from '@ngx-translate/core'; -import { BehaviorSubject } from 'rxjs'; import { availableTranslations } from 'src/app/domain/definitions/languages'; import { Selectable } from 'src/app/domain/interfaces'; import { objectToFormattedString } from 'src/app/infrastructure/utils'; @@ -25,7 +23,7 @@ export class OrganizationSettingsComponent extends BaseComponent { public readonly pageTitle = _(`Settings`); public readonly translations = availableTranslations; - public time_zones = new BehaviorSubject([]); + public time_zones = signal([]); public orgaSettingsForm: UntypedFormGroup | null = null; @@ -41,22 +39,21 @@ export class OrganizationSettingsComponent extends BaseComponent { private _currentOrgaSettings: ViewOrganization | null = null; - public constructor( - protected override translate: TranslateService, - private controller: OrganizationControllerService, - private formBuilder: UntypedFormBuilder, - private operator: OperatorService, - private timeZone: TimeZoneService, - private cd: ChangeDetectorRef - ) { + private formBuilder = inject(UntypedFormBuilder); + private controller = inject(OrganizationControllerService); + private operator = inject(OperatorService); + private timeZone = inject(TimeZoneService); + private cd = inject(ChangeDetectorRef); + + public constructor() { super(); super.setTitle(this.pageTitle); - this.initTimezones(); this.subscriptions.push( this.controller.getViewModelObservable(ORGANIZATION_ID).subscribe(orga => { this._currentOrgaSettings = orga; if (orga) { + this.initTimezones(); if (!this.orgaSettingsForm) { this.orgaSettingsForm = this.createForm(); } @@ -82,7 +79,7 @@ export class OrganizationSettingsComponent extends BaseComponent { users_email_sender: [this._currentOrgaSettings.users_email_sender], users_email_subject: [this._currentOrgaSettings.users_email_subject], default_language: [this._currentOrgaSettings.default_language], - time_zone: [this._currentOrgaSettings.time_zone, Validators.required], + time_zone: [this._currentOrgaSettings.time_zone], require_duplicate_from: [this._currentOrgaSettings.require_duplicate_from ?? false], enable_anonymous: [this._currentOrgaSettings.enable_anonymous ?? false], disable_forward_with_attachments: [this._currentOrgaSettings.disable_forward_with_attachments ?? false], @@ -149,12 +146,17 @@ export class OrganizationSettingsComponent extends BaseComponent { private async initTimezones(): Promise { this.timeZone.getTZForSearchSelector().then(values => { - this.time_zones.next(values); + this.time_zones.set(values); + this.patchTimezoneInForm(); + }); + } + + private patchTimezoneInForm(): void { + if (!this.orgaSettingsForm?.get('time_zone').value) { this.orgaSettingsForm .get('time_zone') - .patchValue(this.timeZone.getTimezoneIdByName(this._currentOrgaSettings.time_zone)); - this.cd.markForCheck(); - }); + .setValue(this.timeZone.getTimezoneIdByName(this.timeZone.getOrganizationTimeZone())); + } } public getAdditionallySearchedValuesFn(item: Selectable): string[] { diff --git a/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts b/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts index 1a2dfb85f3..e6865bb957 100644 --- a/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts +++ b/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts @@ -1,9 +1,11 @@ import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; import { + ChangeDetectorRef, ContentChild, Directive, ElementRef, EventEmitter, + inject, Input, OnDestroy, Output, @@ -267,6 +269,8 @@ export abstract class BaseSearchSelectorComponent return this.searchValueForm.value.trim().toLowerCase(); } + private cd = inject(ChangeDetectorRef); + public ngOnInit(): void { this.subscriptions.push( this.searchValueForm.valueChanges.pipe(debounceTime(100), distinctUntilChanged()).subscribe(value => { @@ -299,6 +303,7 @@ export abstract class BaseSearchSelectorComponent this.selectedIds.push(id); } this.setNextValue(this.selectedIds); + this.cd.markForCheck(); } public onOpenChanged(event: boolean): void { From 46cb274c13f0184cb09c15d9bde7e7383cba2fd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 17:57:12 +0200 Subject: [PATCH 27/71] Bump the tiptap group in /client with 14 updates (#6355) --- client/package-lock.json | 434 +++++++++++++++++++-------------------- client/package.json | 18 +- 2 files changed, 226 insertions(+), 226 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 3e088344ff..ca874a77ae 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -31,20 +31,20 @@ "@ngx-translate/core": "^17.0.0", "@ngx-translate/http-loader": "^17.0.0", "@openslides/motion-diff": "file:../packages/openslides-motion-diff", - "@tiptap/core": "^3.27.1", - "@tiptap/extension-color": "^3.27.1", - "@tiptap/extension-highlight": "^3.27.1", - "@tiptap/extension-image": "^3.27.1", + "@tiptap/core": "^3.27.2", + "@tiptap/extension-color": "^3.27.2", + "@tiptap/extension-highlight": "^3.27.2", + "@tiptap/extension-image": "^3.27.2", "@tiptap/extension-link": "^3.23.4", "@tiptap/extension-list": "^3.22.4", - "@tiptap/extension-subscript": "^3.27.1", - "@tiptap/extension-superscript": "^3.27.1", - "@tiptap/extension-table": "^3.27.1", - "@tiptap/extension-text-align": "^3.27.1", + "@tiptap/extension-subscript": "^3.27.2", + "@tiptap/extension-superscript": "^3.27.2", + "@tiptap/extension-table": "^3.27.2", + "@tiptap/extension-text-align": "^3.27.2", "@tiptap/extension-text-style": "^3.4.2", "@tiptap/extensions": "^3.22.4", "@tiptap/pm": "^3.27.1", - "@tiptap/starter-kit": "^3.27.1", + "@tiptap/starter-kit": "^3.27.2", "@tsparticles/angular": "^3.0.0", "@tsparticles/engine": "^3.9.1", "@tsparticles/plugin-emitters": "^3.9.1", @@ -5437,219 +5437,191 @@ } }, "node_modules/@tiptap/core": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.27.1.tgz", - "integrity": "sha512-rV6Qn4wmC6BxfF+4mu6bqGWj9vA4oXXhsrpXaJL2uhjxeHAGofjwcHof2X84VYzeyXgdlsGmqKie4TAppVXZUQ==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.27.2.tgz", + "integrity": "sha512-zRWROdDbeIghFIT05ZYc+0cCkQFBy7sN/VjFc41qJ1fuq+lfgGDotVUXLuVqVe288jSpo/VGmy/iFLIQTc9mwg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/pm": "3.27.1" + "@tiptap/pm": "3.27.2" } }, "node_modules/@tiptap/extension-blockquote": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.27.1.tgz", - "integrity": "sha512-VMF7xJx6qEGiX6DTKNiL31NLqypOcd/4sNjFSe8rb41PwejBJh/nOqVIbBvWkiT6NMGFLxMhj7zJ8/zPo1hXeg==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.27.2.tgz", + "integrity": "sha512-pafmW5GPZnRktQ4TegU8PIP+udboPw0O0AWYKk9HVDTI+VAqGwe1Xmb9k8tPCyn3et7LO62r14pK3S8Av+dxWQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-bold": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.27.1.tgz", - "integrity": "sha512-TlC5bsS+pqETTrlz4CZz9RO/cKBYtELGIxwtKeivUn3eNfnOxQbbu4WDsiwIfzRFyd0OMnKl6BPM2KnYEehoEQ==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.27.2.tgz", + "integrity": "sha512-R+HZ/symZZhhnxZf3xyGbm2mWf48K+/kYucm88TMzMUWBjXhnL1G2JwaURxXUXb0nvsz6T2IqOhPKwCvAtb7oQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-bullet-list": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.27.1.tgz", - "integrity": "sha512-faCUHnRP47o9Zh9VZZX6EX/569udw9Vopm2PgEKPWuKLE2qaS5WBuUVU0iItdJmKUqaWiOZkpoW4jvnDmj0dfg==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.27.2.tgz", + "integrity": "sha512-YYJfm3IBTOccraVUavKIPQEspZlfCmL1zlcve93OVwujo0ndgk0fy6tp7Xs2EA4dXy303fnu5xKs1H08hkqQMg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.1" + "@tiptap/extension-list": "3.27.2" } }, "node_modules/@tiptap/extension-code": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.27.1.tgz", - "integrity": "sha512-epOUpFfEmBzjvnqvjv2qHX7NAuLo5dlOGV690lWu+sAYMjibuJBeVvAiKPyFCfRCCTUxdbDB3jbaOA1yEcEJ7w==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.27.2.tgz", + "integrity": "sha512-IeWL8DP6dlvSfj3hvluX+pztpNi4tZdyUvcCYG8ODj4WVHom0Vrfila88hNsL8YXbbQ0iNPLoYgcffjfWEm6aA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" - } - }, - "node_modules/@tiptap/extension-code-block": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.27.1.tgz", - "integrity": "sha512-pHlzmZx2OlHfyQ0yRlT5UL4mGokz947DthZuYefN1OleVqOkHpWBG+2JQwqoNq6bmzMne92zbH32rhcJUEYSjA==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "3.27.1", - "@tiptap/pm": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-color": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-color/-/extension-color-3.27.1.tgz", - "integrity": "sha512-9R/vW4dDTce0E0HU+AyfSkKhz08Hlrx7noRRj3CKrTwsCTR86wReTKFHlzxhLKZiDrJuV2Y7CtNG7KGrAArf+A==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-color/-/extension-color-3.27.2.tgz", + "integrity": "sha512-X2Mo7y/49OFg/5I9B2APgXd1DsxseLXyvnvpFBGGj1AYqYGxvvJ9thvyLZr7SZVGjnAlbu3kwI2lhRQdyyIq8w==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-text-style": "3.27.1" + "@tiptap/extension-text-style": "3.27.2" } }, "node_modules/@tiptap/extension-document": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.27.1.tgz", - "integrity": "sha512-8FbBTkfnRP4iVaoj+2h3iWa+H0eGDD3yTyVCwrmue/sQTkqUNUoSuAZa3GDG4Sd41xdPwTJxl9nUWGgM1qDCnw==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.27.2.tgz", + "integrity": "sha512-RkvCVKsAUEBxdc5EltXQfaiC33/PFByokRuVI08IeQDukwF9lrvba/O8vHAcHAh+XWTiy+U88m5ORLUO1MIlJA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-dropcursor": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.27.1.tgz", - "integrity": "sha512-blFf9x9RG0Qr7P3FoAH/033ffa+mMLZn34trVs8Vi0Ppk6FmJAg5HpYFOtmYoeREdNDJ5rHJKV7SoACbOHgskQ==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.27.2.tgz", + "integrity": "sha512-PUMhuvP4zyv41iRR06m87DoeLCBbT6SFstz9QZCZcK6+17rk8cdifFE+LIfRPAoPYEO/+jRoCcJ7BhGrOJDWzA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "3.27.1" + "@tiptap/extensions": "3.27.2" } }, "node_modules/@tiptap/extension-gapcursor": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.27.1.tgz", - "integrity": "sha512-QoezN0wdvXIwLQ4ee2ccWDaX3RG0lzgQpIMpMz55oPDhpUVax1+19ApsS53LkcktpS4EbnPL4xO4DaJk0Vp7PQ==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.27.2.tgz", + "integrity": "sha512-yT5/qzjJHVNfbXOWaQBbIqomhEWgi9ScB6gbY6TdYREqSIZiLVCEjXo9mDU2kiTFLoOznJ6p7BlhmluzKpI6NQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "3.27.1" + "@tiptap/extensions": "3.27.2" } }, "node_modules/@tiptap/extension-hard-break": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.27.1.tgz", - "integrity": "sha512-iv/m9hzl6jfSj9Q8UEjAxONvCoUDaP7M9SRCPx3PaLNxA230TTD6RE0Ye4zFJ8ze7ZVoJJMAqg9Qpq1iYg2JOQ==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.27.2.tgz", + "integrity": "sha512-nlr095C2FOOXF77gp1xKUUdpnvACckyVhIQJyurxOpHFtKFNEL/850MX/QhPHMAbGb/VdkcBqyLvQI59i0pA9A==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-heading": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.27.1.tgz", - "integrity": "sha512-SrC4l1kEIyv9ZXFaI/8LQqU2MyMmjczw7XXsWUQOTN4YXv0JyVgMNR3cI/wz0d2xsTfBdZ1N85Tdng+Ga1t0Sg==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.27.2.tgz", + "integrity": "sha512-AERG0GecEYhQ3j4y1VK+FsDcl1PN5IPMTFZNEbsqyo/ZZBE1bIGriTV5/dTAWPfmUFnJEfR7FYTkqu2cMvL+oA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-highlight": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-highlight/-/extension-highlight-3.27.1.tgz", - "integrity": "sha512-IeMIUKbW4oyRkgn92BPYQ0fifkbTwVigKwa107nGDHMokz+pHQPFHy8xG3U7gtUOra/8OUo57bFgNGuP0TaH4A==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "3.27.1" - } - }, - "node_modules/@tiptap/extension-horizontal-rule": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.27.1.tgz", - "integrity": "sha512-QlKE7qn5qMnIGVGhXQlvYedvLtNJ9z0dmit5w8vPb8tKzW4Spk6M7N2kruprrDA8GBwHfeR5wmF+njfUm34qxg==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-highlight/-/extension-highlight-3.27.2.tgz", + "integrity": "sha512-+PhUkhh8g9a005FvwtDVnxRzadLO2tBWY4plUfJJDDpFIC0lTSxc0Q6ESBEV4x/BnuClH/RKH+tZAhkyEqeTeQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1", - "@tiptap/pm": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-image": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.27.1.tgz", - "integrity": "sha512-+JTahgQT+NxiGjduaB3qJVyhU/wh4m3pVkht1Earioku2bm/apj5Lb8rSowa/NJYP3B+oQgV/V4YLw5dtDgBoA==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.27.2.tgz", + "integrity": "sha512-xnDCj+9oNwr4Zh9B+HHi+9lXyUVYv2KmCF3QuCdGxhZA4FDNlJT3gISwYnH4LNtKSD1XHh/gSCMTpZF+8oqe3g==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-italic": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.27.1.tgz", - "integrity": "sha512-jGGeyn9uRUnNjSTHpbqhiGsp6KaYTSbV09jDXPJI9cDwfV9hpugLvpaCZd0BMBbhU1B1W6kOfX0BE15qX/HQfA==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.27.2.tgz", + "integrity": "sha512-iAnhS/UbQkk8jioeIMyn98clQGF+6eozrYqABmmzE/lxvYew0PfeNbNnj2poOCZ93USU1pYcf06Kp2Q85wpfwA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-link": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.27.1.tgz", - "integrity": "sha512-/2jBfsxBZUDGJmpZifqRQPz7f1E5qpS1BckTZ39TADzUJX+feKy7RJ3DtQ02+8y6SSMzvP9loGVjrk6zEMTk4g==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.27.2.tgz", + "integrity": "sha512-I3VvI5/J4afMEQbjkcW2sw0ediJMy+Asz46nI2C6cK+qDtGatE9jOZo/rFMG5scTwSx3nrIZkbCcTMTJz1TFEw==", "license": "MIT", "dependencies": { "linkifyjs": "^4.3.3" @@ -5659,216 +5631,216 @@ "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1", - "@tiptap/pm": "3.27.1" + "@tiptap/core": "3.27.2", + "@tiptap/pm": "3.27.2" } }, "node_modules/@tiptap/extension-list": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.27.1.tgz", - "integrity": "sha512-c2Upru7lj0/ZV/Ibww6cNz6sUS8m6Dp/9uygFhYcZOd3X8M0xBIEk42c6m6SQehkPziVA8QOgNJz7sMqsbz1OQ==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.27.2.tgz", + "integrity": "sha512-SsVnh5ruM9QjgOGbhJjegHAIADuoE+9Sb0UV+lyxAeuEwO98JpVmE926Yur9abzUAA9MWZZ/XBIzoA5q0a4dBQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1", - "@tiptap/pm": "3.27.1" + "@tiptap/core": "3.27.2", + "@tiptap/pm": "3.27.2" } }, "node_modules/@tiptap/extension-list-item": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.27.1.tgz", - "integrity": "sha512-zwRl01ETfCkWUvtvK5fw9bXtAajMPkvlkE3Cq6JvH3LF7XXJwDtNj5Tj7exacMpCaSZmlNc43vFb2rAYnrnwMA==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.27.2.tgz", + "integrity": "sha512-k3D6CMZMn5GhxiCLCMizAs1uEXyQOzhR/ySiwqE3SCvz2R1Uvyg68WKcs0j5Mto5OQoD+e1H2SaLFP6+dyez4A==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.1" + "@tiptap/extension-list": "3.27.2" } }, "node_modules/@tiptap/extension-list-keymap": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.27.1.tgz", - "integrity": "sha512-OIMZNlzPSO8WRd4ic73Fxckzl4N1tesjjLL2XApaNA/uMpO0LoF6WSRPAWv+Z24Wp92ARRJAnRP7iZoI5+Jxig==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.27.2.tgz", + "integrity": "sha512-0Iy8+6/LPvD1+wpRr/RnHQ73ykoovjUf6HEw6RFyXDnUWWVnU6YLUNLxMUpuiKQ+k3d/gRRKITrCqghIuqiwJQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.1" + "@tiptap/extension-list": "3.27.2" } }, "node_modules/@tiptap/extension-ordered-list": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.27.1.tgz", - "integrity": "sha512-GYrKqD//9nHJ2r80uXqbDMzRnFpGzbaEQRTSGaO/SH7DvXWFMow8evkOdjQ7PCQO07jNjJo75+A85Jwu3Ov3AA==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.27.2.tgz", + "integrity": "sha512-AqPDtnwm9QR50BYTC30Pas5fQhRQZvOOBykhbbPefYta8GzSF4sD4L/dSWqitDbZCOTQgL9EbtsJdpmKGF5hJQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.1" + "@tiptap/extension-list": "3.27.2" } }, "node_modules/@tiptap/extension-paragraph": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.27.1.tgz", - "integrity": "sha512-7K7eo1gruOgAsnbK+GCV23AUVUI0cL1bTig8HaPneoFMVbig7vddk8jNLKBWO8TXVbG7TuHdnDN4F98vdtwh5Q==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.27.2.tgz", + "integrity": "sha512-On4uQqEbdmV5sgDRisIkLUqrhSEjr38QnIr7Zl2Lvnd4//RGkuJALhyJrZBkHh0VXNMbqPeJ3lL7l/beG1RXDg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-strike": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.27.1.tgz", - "integrity": "sha512-Y3DW1jlSlCNCyMGHP3+3qBNNPS83wuFz4RTYGjZtvRRTCRh7apZme9XRWMq1rN5mJ2Cr7fKocA2/5Bs13KgN6Q==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.27.2.tgz", + "integrity": "sha512-5trECNOg49bQEWJmxmEHg1KqWaPzCS3FYwU73Cy/XsJuOllTV2MoHP3si+pmSXtDGptpPIumZ6BPE9v2/QqzXw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-subscript": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-3.27.1.tgz", - "integrity": "sha512-A8bokr7c7QBndZcMX0F4AK1y4xEYd5MvOczojFusaiTfvAnH3D8PwFbOPQs3ZLB8W9K3bn4g/XH55P1IAPFGyg==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-3.27.2.tgz", + "integrity": "sha512-6HHxKOJ57A0RpLawTlCawW58bmBff6rF1+lmamxVK90J0krGLzR//GCqJm9S2lij7wZc+rJ3UoF+hCcZlBZAcw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1", - "@tiptap/pm": "3.27.1" + "@tiptap/core": "3.27.2", + "@tiptap/pm": "3.27.2" } }, "node_modules/@tiptap/extension-superscript": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-3.27.1.tgz", - "integrity": "sha512-8021uld246dqhtzZdzjvnWcfiJwElPQ50zZe7Fc3QGFiNRDVWQ2ATXGJFmXEopgCU5GuZaytPMtAq4UVDXc6xw==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-3.27.2.tgz", + "integrity": "sha512-dy0MtbbR6/4JsUhANsF5O7TXum1LoAZJkHbZK+KZSgXVGtFlfB2GCS1MUg6bBhB3LGhSvF118pR0SxeKF+HTMA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1", - "@tiptap/pm": "3.27.1" + "@tiptap/core": "3.27.2", + "@tiptap/pm": "3.27.2" } }, "node_modules/@tiptap/extension-table": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.27.1.tgz", - "integrity": "sha512-tNB8kjxo0+XPremnWkd6NUikpeJ+JQrss7HntL8GgIxX4t0gkdnLn9yUWb0JzcaYP7Y8iTZZHdkPs0P154DG8Q==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.27.2.tgz", + "integrity": "sha512-lOuapZby/RgOmrAg5OlTIh/4li8qYhbbTJLKXGq+vCl2BlWLZBMXrhdzPnIqqCiD7mLhNoOPA4kQOohJUah+ww==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1", - "@tiptap/pm": "3.27.1" + "@tiptap/core": "3.27.2", + "@tiptap/pm": "3.27.2" } }, "node_modules/@tiptap/extension-text": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.27.1.tgz", - "integrity": "sha512-6ZwaZwSrDh+KFFv6V1J79oO37yPs7y1bFxvk1/9Ih2rn3Xr5AWz+eMS+n8RpH3djBVVAQpdIAeYQgcn+VCSsTg==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.27.2.tgz", + "integrity": "sha512-ZipAYrdVLtWU/YwdXkSGrW/PJnxqLGtx/GR5f0BSMO/OzxJppSc+5GSu+MEbwlFaptloSKQEHRbkACXDqm4IJg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-text-align": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.27.1.tgz", - "integrity": "sha512-EXawuJBO55wd8WcTbHTMoPhv0CGQxza4yCCPB5Hqz4ZPQwahIr3ej+8yp/kimIl0xokabwZ0/Fu8STQ4AkZv5g==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.27.2.tgz", + "integrity": "sha512-38MH2LOYzZPbJMFoL+M+NpIUpI2pMefTVRuqlHSNoAdn6wEyJoByEeceRab2vt7/S4w9lWcWxwzsXEa38G/5WQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-text-style": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.27.1.tgz", - "integrity": "sha512-J48WIl+6YDYTFPhWXUBQk+u7+AKVUqTdvrZOQyPYCGuQMgHrYzgWrI5+HeEifUgXJ5rMIWWP3qytp7KhVVqpDQ==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.27.2.tgz", + "integrity": "sha512-kgGg3LXYnEEttqM6CsiSLxRVU5055vON1T5xipskmbdDtV/xXTykzbISiX3ND5zYw+BG7hF8COEKLt1iLo6LbA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extension-underline": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.27.1.tgz", - "integrity": "sha512-N889J4nXN/TPfVt8uF9N1A0SY82E90zwc1y26lqOcw6KWNLmQrlhMh/9OD4ikLDbekmFpOBq/UicpHf/6S8hbQ==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.27.2.tgz", + "integrity": "sha512-5/1XpKxBqAkiR6ND2P/jcPQ06Opcz/Nidd6dasMkjxwuRJPU5OSz3Qy1fsfLlduRU8TzSqjT8vpQJgaqsHqbLA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1" + "@tiptap/core": "3.27.2" } }, "node_modules/@tiptap/extensions": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.27.1.tgz", - "integrity": "sha512-1Tdx9faw8k0/83V6X+xCDVhV8yElGt95JxeW3YMkKQJI56QdlPz0xOdJPlMiSGJKinPyVier+x9LJD/YZUZIaw==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.27.2.tgz", + "integrity": "sha512-WPmMf6+CXEgVpsxFGj20DYLt0gNU2zBATmxSPN5L+sDUx3gKXVjFtQxhKvrhaba5ubO45rIV1hJdo0AGu9TmBA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.1", - "@tiptap/pm": "3.27.1" + "@tiptap/core": "3.27.2", + "@tiptap/pm": "3.27.2" } }, "node_modules/@tiptap/pm": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.27.1.tgz", - "integrity": "sha512-Ffjx+vimmBU7zH/KrpXzJid3+pziCe/VL2aexSTP63cyQwKQ65LkFkCKaIsSpFdQQuakVZBGWjCA5RoBV852pw==", + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.27.2.tgz", + "integrity": "sha512-4eBV9Fx16ZZUJuO4AvHzykxdYXfF/iMjpoI8q9PHvxOe+xx8tNa4ONhZMKJLpgCKEECJiBkQmr0gOmarzB0MtA==", "license": "MIT", "dependencies": { - "prosemirror-changeset": "^2.3.0", - "prosemirror-commands": "^1.6.2", - "prosemirror-dropcursor": "^1.8.1", - "prosemirror-gapcursor": "^1.3.2", - "prosemirror-history": "^1.4.1", - "prosemirror-inputrules": "^1.4.0", + "prosemirror-changeset": "^2.4.1", + "prosemirror-commands": "^1.7.1", + "prosemirror-dropcursor": "^1.8.2", + "prosemirror-gapcursor": "^1.4.1", + "prosemirror-history": "^1.5.0", + "prosemirror-inputrules": "^1.5.1", "prosemirror-keymap": "^1.2.3", - "prosemirror-model": "^1.25.7", - "prosemirror-schema-list": "^1.5.0", + "prosemirror-model": "^1.25.9", + "prosemirror-schema-list": "^1.5.1", "prosemirror-state": "^1.4.4", - "prosemirror-tables": "^1.8.0", + "prosemirror-tables": "^1.8.5", "prosemirror-transform": "^1.12.0", - "prosemirror-view": "^1.41.8" + "prosemirror-view": "^1.41.9" }, "funding": { "type": "github", @@ -5876,39 +5848,67 @@ } }, "node_modules/@tiptap/starter-kit": { - "version": "3.27.1", - "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.27.1.tgz", - "integrity": "sha512-vfxRsqW8rCc0k4pzo0ilU3wobVi2wqVj88VZI2SlgZlNnUAkrDGDIAph7CTa9k9fshV+O1ivpEgPC5yC046jow==", - "license": "MIT", - "dependencies": { - "@tiptap/core": "^3.27.1", - "@tiptap/extension-blockquote": "^3.27.1", - "@tiptap/extension-bold": "^3.27.1", - "@tiptap/extension-bullet-list": "^3.27.1", - "@tiptap/extension-code": "^3.27.1", - "@tiptap/extension-code-block": "^3.27.1", - "@tiptap/extension-document": "^3.27.1", - "@tiptap/extension-dropcursor": "^3.27.1", - "@tiptap/extension-gapcursor": "^3.27.1", - "@tiptap/extension-hard-break": "^3.27.1", - "@tiptap/extension-heading": "^3.27.1", - "@tiptap/extension-horizontal-rule": "^3.27.1", - "@tiptap/extension-italic": "^3.27.1", - "@tiptap/extension-link": "^3.27.1", - "@tiptap/extension-list": "^3.27.1", - "@tiptap/extension-list-item": "^3.27.1", - "@tiptap/extension-list-keymap": "^3.27.1", - "@tiptap/extension-ordered-list": "^3.27.1", - "@tiptap/extension-paragraph": "^3.27.1", - "@tiptap/extension-strike": "^3.27.1", - "@tiptap/extension-text": "^3.27.1", - "@tiptap/extension-underline": "^3.27.1", - "@tiptap/extensions": "^3.27.1", - "@tiptap/pm": "^3.27.1" + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.27.2.tgz", + "integrity": "sha512-X28UrkkJPli8f2eCRkpaxE0PDbpwKNCxKrHE6tH40hHtd7SG4zgMw0bBmNYa9o+DJGc5dXipjK6sSc+2sud3cg==", + "license": "MIT", + "dependencies": { + "@tiptap/core": "^3.27.2", + "@tiptap/extension-blockquote": "^3.27.2", + "@tiptap/extension-bold": "^3.27.2", + "@tiptap/extension-bullet-list": "^3.27.2", + "@tiptap/extension-code": "^3.27.2", + "@tiptap/extension-code-block": "^3.27.2", + "@tiptap/extension-document": "^3.27.2", + "@tiptap/extension-dropcursor": "^3.27.2", + "@tiptap/extension-gapcursor": "^3.27.2", + "@tiptap/extension-hard-break": "^3.27.2", + "@tiptap/extension-heading": "^3.27.2", + "@tiptap/extension-horizontal-rule": "^3.27.2", + "@tiptap/extension-italic": "^3.27.2", + "@tiptap/extension-link": "^3.27.2", + "@tiptap/extension-list": "^3.27.2", + "@tiptap/extension-list-item": "^3.27.2", + "@tiptap/extension-list-keymap": "^3.27.2", + "@tiptap/extension-ordered-list": "^3.27.2", + "@tiptap/extension-paragraph": "^3.27.2", + "@tiptap/extension-strike": "^3.27.2", + "@tiptap/extension-text": "^3.27.2", + "@tiptap/extension-underline": "^3.27.2", + "@tiptap/extensions": "^3.27.2", + "@tiptap/pm": "^3.27.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/ueberdosis" + } + }, + "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-code-block": { + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.27.2.tgz", + "integrity": "sha512-RlrQdRLIHapi3YDYzNJa1cWnpM9aynGPoqmoEk3qdyOrXO/FFBQk/tUy+IsxZhaNSnuYPo/5cgzwG2z6Ofa9Sw==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/ueberdosis" }, + "peerDependencies": { + "@tiptap/core": "3.27.2", + "@tiptap/pm": "3.27.2" + } + }, + "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-horizontal-rule": { + "version": "3.27.2", + "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.27.2.tgz", + "integrity": "sha512-kuDRRmV5Hz/S6eYh5DRtG6RwbQdbThMEOs65d9MjLyNdJi+o9LMtmEm1Bd3ZLYRuIDKbdaNyXe8D6auGzsPHuQ==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" + }, + "peerDependencies": { + "@tiptap/core": "3.27.2", + "@tiptap/pm": "3.27.2" } }, "node_modules/@ts-morph/common": { @@ -13146,9 +13146,9 @@ "license": "MIT" }, "node_modules/prosemirror-changeset": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.3.0.tgz", - "integrity": "sha512-8wRKhlEwEJ4I13Ju54q2NZR1pVKGTgJ/8XsQ8L5A5uUsQ/YQScQJuEAuh8Bn8i6IwAMjjLRABd9lVli+DlIiVw==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.4.1.tgz", + "integrity": "sha512-96WBLhOaYhJ+kPhLg3uW359Tz6I/MfcrQfL4EGv4SrcqKEMC1gmoGrXHecPE8eOwTVCJ4IwgfzM8fFad25wNfw==", "license": "MIT", "dependencies": { "prosemirror-transform": "^1.0.0" @@ -13166,9 +13166,9 @@ } }, "node_modules/prosemirror-dropcursor": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/prosemirror-dropcursor/-/prosemirror-dropcursor-1.8.1.tgz", - "integrity": "sha512-M30WJdJZLyXHi3N8vxN6Zh5O8ZBbQCz0gURTfPmTIBNQ5pxrdU7A58QkNqfa98YEjSAL1HUyyU34f6Pm5xBSGw==", + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/prosemirror-dropcursor/-/prosemirror-dropcursor-1.8.3.tgz", + "integrity": "sha512-FoYbsJR8gK+DGlqhNoE29Loa38eIZPzQRIb1VMaDNBoo4OLP6vVof/jR8qFY/6XvUd6Dhug8MDCHl2a/h8RTfQ==", "license": "MIT", "dependencies": { "prosemirror-state": "^1.0.0", @@ -13177,9 +13177,9 @@ } }, "node_modules/prosemirror-gapcursor": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/prosemirror-gapcursor/-/prosemirror-gapcursor-1.3.2.tgz", - "integrity": "sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/prosemirror-gapcursor/-/prosemirror-gapcursor-1.4.1.tgz", + "integrity": "sha512-pMdYaEnjNMSwl11yjEGtgTmLkR08m/Vl+Jj443167p9eB3HVQKhYCc4gmHVDsLPODfZfjr/MmirsdyZziXbQKw==", "license": "MIT", "dependencies": { "prosemirror-keymap": "^1.0.0", @@ -13221,9 +13221,9 @@ } }, "node_modules/prosemirror-model": { - "version": "1.25.7", - "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.25.7.tgz", - "integrity": "sha512-A79aN8QEFUwI6cax8Yq4Rpcx1TJZ3Kagn+ii7qLo4/V8H3mMiHrhFyhTyHHvpSnOgMPpWiDGSwM3etwrxE50ug==", + "version": "1.25.10", + "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.25.10.tgz", + "integrity": "sha512-9n6rH4DbJU1eH4SxLt6Y0HhJIo6cZsb7DJ/30uob1hOKPeO6TAaMWI2tc7kwR92BjfPOU2fFHWbZLovLi3XQfA==", "license": "MIT", "dependencies": { "orderedmap": "^2.0.0" @@ -13274,12 +13274,12 @@ } }, "node_modules/prosemirror-view": { - "version": "1.41.8", - "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.41.8.tgz", - "integrity": "sha512-TnKDdohEatgyZNGCDWIdccOHXhYloJwbwU+phw/a23KBvJIR9lWQWW7WHHK3vBdOLDNuF7TaX98GObUZOWkOnA==", + "version": "1.42.0", + "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.42.0.tgz", + "integrity": "sha512-N54DF3OXNWDuP81G1kbfCys8ZzIjuL1VnvJ2mk5STSu/fNxWIcX/EutQLA3s9KR/2wVhgDi4hzBB/1fINVxk0A==", "license": "MIT", "dependencies": { - "prosemirror-model": "^1.20.0", + "prosemirror-model": "^1.25.8", "prosemirror-state": "^1.0.0", "prosemirror-transform": "^1.1.0" } diff --git a/client/package.json b/client/package.json index 6912dd214e..d41c612a35 100644 --- a/client/package.json +++ b/client/package.json @@ -54,20 +54,20 @@ "@ngx-translate/core": "^17.0.0", "@ngx-translate/http-loader": "^17.0.0", "@openslides/motion-diff": "file:../packages/openslides-motion-diff", - "@tiptap/core": "^3.27.1", - "@tiptap/extension-color": "^3.27.1", - "@tiptap/extension-highlight": "^3.27.1", - "@tiptap/extension-image": "^3.27.1", + "@tiptap/core": "^3.27.2", + "@tiptap/extension-color": "^3.27.2", + "@tiptap/extension-highlight": "^3.27.2", + "@tiptap/extension-image": "^3.27.2", "@tiptap/extension-link": "^3.23.4", "@tiptap/extension-list": "^3.22.4", - "@tiptap/extension-subscript": "^3.27.1", - "@tiptap/extension-superscript": "^3.27.1", - "@tiptap/extension-table": "^3.27.1", - "@tiptap/extension-text-align": "^3.27.1", + "@tiptap/extension-subscript": "^3.27.2", + "@tiptap/extension-superscript": "^3.27.2", + "@tiptap/extension-table": "^3.27.2", + "@tiptap/extension-text-align": "^3.27.2", "@tiptap/extension-text-style": "^3.4.2", "@tiptap/extensions": "^3.22.4", "@tiptap/pm": "^3.27.1", - "@tiptap/starter-kit": "^3.27.1", + "@tiptap/starter-kit": "^3.27.2", "@tsparticles/angular": "^3.0.0", "@tsparticles/engine": "^3.9.1", "@tsparticles/plugin-emitters": "^3.9.1", From 8bbf10d7c56f1c5f361752455b9b8403b55c6d60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 17:58:00 +0200 Subject: [PATCH 28/71] Bump the angular group in /client with 2 updates (#6354) --- client/package-lock.json | 96 ++++++++++++++++++++-------------------- client/package.json | 4 +- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index ca874a77ae..7dfee8c02f 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -80,8 +80,8 @@ "@angular-eslint/eslint-plugin-template": "^21.4.0", "@angular-eslint/schematics": "^21.4.0", "@angular-eslint/template-parser": "^21.3.0", - "@angular/build": "^21.2.17", - "@angular/cli": "^21.2.17", + "@angular/build": "^21.2.18", + "@angular/cli": "^21.2.18", "@angular/compiler-cli": "^21.2.17", "@angular/language-server": "^21.2.17", "@coreui/angular-chartjs": "^5.6.24", @@ -362,13 +362,13 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.2102.17", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2102.17.tgz", - "integrity": "sha512-+lkmpEfKXuPZaGZRCCT/B2JGSnafudEVMLeolAW0G7de28bwJIwTE5nmr/rcKTy4NnEDX/8B53tWTXGENuQvmg==", + "version": "0.2102.18", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2102.18.tgz", + "integrity": "sha512-bEkF4ApWa6FJ2+ZyFPdhQr05PgJv/oKwx+3goNRa4lSxzJO+O3KXr0ivTyE5zEJ8l4JdV3h93bsCP54Rk3v7Dw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "21.2.17", + "@angular-devkit/core": "21.2.18", "rxjs": "7.8.2" }, "bin": { @@ -381,9 +381,9 @@ } }, "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.17.tgz", - "integrity": "sha512-JbGWwFX1Nv4Np0S9b4HP2SUKhR2bz6l/S8zBXnam95+RXzDaqXJDmQHOHZGS+4La06SjlcXwFyrgSI0rm50A1A==", + "version": "21.2.18", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.18.tgz", + "integrity": "sha512-783AuDmzAjFkOBHey7cx1mXd8CTiMg9LvG+BCxEp8i4EB7cOGYrq3lBzkwhKJq6yYpz7dNgM1QgeLk+NcrFBSA==", "dev": true, "license": "MIT", "dependencies": { @@ -409,13 +409,13 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-21.2.17.tgz", - "integrity": "sha512-IMsbo/OBG0mdCRxezbq/CLo6JxUJBOAHZfbUDzxbSRwJm8FT5AbXO7rW+Z3haoqcb+WrC5Pr+DQ6WolX2x2brQ==", + "version": "21.2.18", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-21.2.18.tgz", + "integrity": "sha512-PakHs+Eefx06KORDFyH4wmkIZ/wm4mI4DqhXe4XFuWJOazMQoYJxPmMeby47BD0HhvJN7BskN61CPS8HCAvICg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "21.2.17", + "@angular-devkit/core": "21.2.18", "jsonc-parser": "3.3.1", "magic-string": "0.30.21", "ora": "9.3.0", @@ -428,9 +428,9 @@ } }, "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.17.tgz", - "integrity": "sha512-JbGWwFX1Nv4Np0S9b4HP2SUKhR2bz6l/S8zBXnam95+RXzDaqXJDmQHOHZGS+4La06SjlcXwFyrgSI0rm50A1A==", + "version": "21.2.18", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.18.tgz", + "integrity": "sha512-783AuDmzAjFkOBHey7cx1mXd8CTiMg9LvG+BCxEp8i4EB7cOGYrq3lBzkwhKJq6yYpz7dNgM1QgeLk+NcrFBSA==", "dev": true, "license": "MIT", "dependencies": { @@ -685,14 +685,14 @@ } }, "node_modules/@angular/build": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-21.2.17.tgz", - "integrity": "sha512-1tKQoRH8/21lf3Z1+ezaHmzdhAmeJx34wVW69DU+NuumsjDHDuq2YdUbiC936SnI33tDXov5UOBMqzjHe8qUTg==", + "version": "21.2.18", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-21.2.18.tgz", + "integrity": "sha512-9Jic0Dud6d0ULPR5SceHV86AzZE42cNWPsbLKrK1dUneaAC44GSVRTmLXcaSX/5Exa3gGjFANQw4qashgxUekQ==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.2102.17", + "@angular-devkit/architect": "0.2102.18", "@babel/core": "7.29.7", "@babel/helper-annotate-as-pure": "7.27.3", "@babel/helper-split-export-declaration": "7.24.7", @@ -715,8 +715,8 @@ "semver": "7.7.4", "source-map-support": "0.5.21", "tinyglobby": "0.2.15", - "undici": "7.24.4", - "vite": "7.3.5", + "undici": "7.28.0", + "vite": "7.3.6", "watchpack": "2.5.1" }, "engines": { @@ -735,7 +735,7 @@ "@angular/platform-browser": "^21.0.0", "@angular/platform-server": "^21.0.0", "@angular/service-worker": "^21.0.0", - "@angular/ssr": "^21.2.17", + "@angular/ssr": "^21.2.18", "karma": "^6.4.0", "less": "^4.2.0", "ng-packagr": "^21.0.0", @@ -1333,19 +1333,19 @@ } }, "node_modules/@angular/cli": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-21.2.17.tgz", - "integrity": "sha512-wyEPOszxza7kUa1BWyERUqSDmAC/DF5Iun0YJ1sN22jDriOuOlYh9hXSk1EHs06fQ1JcTYLml+timHVHg4V1/w==", + "version": "21.2.18", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-21.2.18.tgz", + "integrity": "sha512-WOZF4p0SnrmBpNeiOA2pdp9OBvGnOSLWbGdRLXJykyseIiEn7+N+GZp+ZA1aNZB4SWolpYCZfTYwkpo6Sf/LXg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.2102.17", - "@angular-devkit/core": "21.2.17", - "@angular-devkit/schematics": "21.2.17", + "@angular-devkit/architect": "0.2102.18", + "@angular-devkit/core": "21.2.18", + "@angular-devkit/schematics": "21.2.18", "@inquirer/prompts": "7.10.1", "@listr2/prompt-adapter-inquirer": "3.0.5", "@modelcontextprotocol/sdk": "1.26.0", - "@schematics/angular": "21.2.17", + "@schematics/angular": "21.2.18", "@yarnpkg/lockfile": "1.1.0", "algoliasearch": "5.48.1", "ini": "6.0.0", @@ -1368,9 +1368,9 @@ } }, "node_modules/@angular/cli/node_modules/@angular-devkit/core": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.17.tgz", - "integrity": "sha512-JbGWwFX1Nv4Np0S9b4HP2SUKhR2bz6l/S8zBXnam95+RXzDaqXJDmQHOHZGS+4La06SjlcXwFyrgSI0rm50A1A==", + "version": "21.2.18", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.18.tgz", + "integrity": "sha512-783AuDmzAjFkOBHey7cx1mXd8CTiMg9LvG+BCxEp8i4EB7cOGYrq3lBzkwhKJq6yYpz7dNgM1QgeLk+NcrFBSA==", "dev": true, "license": "MIT", "dependencies": { @@ -5269,14 +5269,14 @@ ] }, "node_modules/@schematics/angular": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-21.2.17.tgz", - "integrity": "sha512-rKHz2//1S3j4MKfsRDtJjnNoCfqSj2dNJDN27pLT9h4oLfBs2wJinfRTQywo2fVGdUcDd+mXBnltqdLJlcoFNw==", + "version": "21.2.18", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-21.2.18.tgz", + "integrity": "sha512-XNEWvJSUg/ljLXgGVs7picBOtzVC4abBf2+i/ds9E7GaYYVyH19Mpgk6BOuMHAgRpjPWBAeWiBkTqetiR2Ps5Q==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "21.2.17", - "@angular-devkit/schematics": "21.2.17", + "@angular-devkit/core": "21.2.18", + "@angular-devkit/schematics": "21.2.18", "jsonc-parser": "3.3.1" }, "engines": { @@ -5286,9 +5286,9 @@ } }, "node_modules/@schematics/angular/node_modules/@angular-devkit/core": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.17.tgz", - "integrity": "sha512-JbGWwFX1Nv4Np0S9b4HP2SUKhR2bz6l/S8zBXnam95+RXzDaqXJDmQHOHZGS+4La06SjlcXwFyrgSI0rm50A1A==", + "version": "21.2.18", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.18.tgz", + "integrity": "sha512-783AuDmzAjFkOBHey7cx1mXd8CTiMg9LvG+BCxEp8i4EB7cOGYrq3lBzkwhKJq6yYpz7dNgM1QgeLk+NcrFBSA==", "dev": true, "license": "MIT", "dependencies": { @@ -14880,9 +14880,9 @@ } }, "node_modules/undici": { - "version": "7.24.4", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.4.tgz", - "integrity": "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.28.0.tgz", + "integrity": "sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==", "dev": true, "license": "MIT", "engines": { @@ -15145,13 +15145,13 @@ } }, "node_modules/vite": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.5.tgz", - "integrity": "sha512-KuOaNhcnGFN2zIPGA7wRmzF+lJA1sea7rHq17aiJ++9lzY1WWG6Jpwqwe1KNbRVPIqHmr8GLYx7jbrQcN/7/ww==", + "version": "7.3.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.6.tgz", + "integrity": "sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==", "dev": true, "license": "MIT", "dependencies": { - "esbuild": "^0.27.0", + "esbuild": "^0.27.0 || ^0.28.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", diff --git a/client/package.json b/client/package.json index d41c612a35..0d6e7a1729 100644 --- a/client/package.json +++ b/client/package.json @@ -103,8 +103,8 @@ "@angular-eslint/eslint-plugin-template": "^21.4.0", "@angular-eslint/schematics": "^21.4.0", "@angular-eslint/template-parser": "^21.3.0", - "@angular/build": "^21.2.17", - "@angular/cli": "^21.2.17", + "@angular/build": "^21.2.18", + "@angular/cli": "^21.2.18", "@angular/compiler-cli": "^21.2.17", "@angular/language-server": "^21.2.17", "@coreui/angular-chartjs": "^5.6.24", From e54d6f35972e6b5d8a596b646b7e137bb058eaaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 18:02:47 +0200 Subject: [PATCH 29/71] Bump typescript-eslint from 8.62.0 to 8.62.1 in /client (#6358) --- client/package-lock.json | 124 +++++++++++++++++++-------------------- client/package.json | 2 +- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 7dfee8c02f..7695e0d5e0 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -117,7 +117,7 @@ "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.62.0" + "typescript-eslint": "^8.62.1" } }, "../packages/openslides-motion-diff": { @@ -6619,17 +6619,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.62.0.tgz", - "integrity": "sha512-o+mpz7EYiMzXoySXiKmzlabIvTVqUuK5yLrAedRPRDA0IpPFMUV1IXt6OqljIxX/kumN6EjUYp41Hqelh6p/Dw==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.62.1.tgz", + "integrity": "sha512-4EQM77WgVNxj7OkL/5b/D/xZsw00G577+UriYTC7JF5opcF3T2AuoeY7ueLaZgSVjSgCS6yOAJB5bRGLPSJUzA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.62.0", - "@typescript-eslint/type-utils": "8.62.0", - "@typescript-eslint/utils": "8.62.0", - "@typescript-eslint/visitor-keys": "8.62.0", + "@typescript-eslint/scope-manager": "8.62.1", + "@typescript-eslint/type-utils": "8.62.1", + "@typescript-eslint/utils": "8.62.1", + "@typescript-eslint/visitor-keys": "8.62.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -6642,22 +6642,22 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.62.0", + "@typescript-eslint/parser": "^8.62.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.0.tgz", - "integrity": "sha512-dzHeT2gySzZtLDsuqxU9AkYgIsQoHAHtRBpOqM+Ofzx1Bwrd2RcCjQJ+6iQbsHOIR6NS33bF2W1k3blN1zLDrA==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.1.tgz", + "integrity": "sha512-sPhE4iHuJDSvoAiec+Ro8JyXw8f0ql13HFR82P99nCm9GwTEKG0KYLvDe6REk8BCXuit6vJAv/Yxg5ABaNS2rA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.62.0", - "@typescript-eslint/types": "8.62.0", - "@typescript-eslint/typescript-estree": "8.62.0", - "@typescript-eslint/visitor-keys": "8.62.0", + "@typescript-eslint/scope-manager": "8.62.1", + "@typescript-eslint/types": "8.62.1", + "@typescript-eslint/typescript-estree": "8.62.1", + "@typescript-eslint/visitor-keys": "8.62.1", "debug": "^4.4.3" }, "engines": { @@ -6673,14 +6673,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.0.tgz", - "integrity": "sha512-wexnCqiTg7BOGtbLDftYpRWlmLq4xfoMd7BKFR6Y75sZS3QmRKLdN3yWLhmIYgqMmP/OXWpj3H8odkb5nGURCQ==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.1.tgz", + "integrity": "sha512-yQ3RgY5RkSBpsNS1Bx/JQEcA24FOSdfGktoyprAr5u18390UQdtVcfnEv4nIrIshNnavlVyZBKxQwT1fIAE6cg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.62.0", - "@typescript-eslint/types": "^8.62.0", + "@typescript-eslint/tsconfig-utils": "^8.62.1", + "@typescript-eslint/types": "^8.62.1", "debug": "^4.4.3" }, "engines": { @@ -6695,14 +6695,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.0.tgz", - "integrity": "sha512-1lX38kNxXIRb8mEc3lbq5mdHq1Pf2+U0nFU65KfT18mtPxxl0fvjuEE92mHuXPuCtElJhOrddOpyMlM3Z0umEA==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.1.tgz", + "integrity": "sha512-r4d249KbQ1SFdpeStvob8Ih6aPPIzfqllPVOtvhve6ZcpuVcYo5/7zUWckKpHE7StASX4kTKZTLf0WQm/wPkcg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.62.0", - "@typescript-eslint/visitor-keys": "8.62.0" + "@typescript-eslint/types": "8.62.1", + "@typescript-eslint/visitor-keys": "8.62.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6713,9 +6713,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.0.tgz", - "integrity": "sha512-y2GAdB6ykaXUvuspbYnizQc4oDDz0Tz/Yc7iWrXf9mx8vm/L/0vLHCe0tS2boG96Zy+DivnVDQ9ZUEWoHqqx1g==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.1.tgz", + "integrity": "sha512-xadytJqX9vJVQ2fdQjkcIVigwaOJNWkpjdLt6cEQ+xPnrI1fkp+/jZE/I97k9KUjqtpd25i0HeyZf3T6dutv2g==", "dev": true, "license": "MIT", "engines": { @@ -6730,15 +6730,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.62.0.tgz", - "integrity": "sha512-+g5O3j0w2ldzC86Pv6fvbO/xhAonbJFIdf/MKQ1d30gndlsVzUOE83ldfSE15Qrl9fhFjK6AovHs5Wpp6vx86w==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.62.1.tgz", + "integrity": "sha512-aXM5xlqXiTxPibXB93cLAURfT3rlizf7uMXISCXy66Isr/9hISJx3yDsKl0L7lKa51b8JpFuNKby0/O0pEm9jg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.62.0", - "@typescript-eslint/typescript-estree": "8.62.0", - "@typescript-eslint/utils": "8.62.0", + "@typescript-eslint/types": "8.62.1", + "@typescript-eslint/typescript-estree": "8.62.1", + "@typescript-eslint/utils": "8.62.1", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -6755,9 +6755,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz", - "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.1.tgz", + "integrity": "sha512-ooCzJFaf+Hg+uG6fA3NRFGuFjlfNlDhBthbv4ZPU/0elCAFUfnyXUvf/WOpHz/jYwSmvU2GkR2LtyUfy1AxZ1Q==", "dev": true, "license": "MIT", "engines": { @@ -6769,16 +6769,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.0.tgz", - "integrity": "sha512-+hVbNxtW64pIcZWDPGbyaKF7vp2IBTVY5ma1blwwksrjdsbdqqEKvJWMGbBofei4F6Dovx1M0RJgoFeNu2279A==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.1.tgz", + "integrity": "sha512-xMcW9oP9u7fAMXYs9A65CVmtLQe2r//oXINHfi8HV+oiqhih17sbLdhXr4540YWlgpDKQdY854OL5ZrdCiQsAA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.62.0", - "@typescript-eslint/tsconfig-utils": "8.62.0", - "@typescript-eslint/types": "8.62.0", - "@typescript-eslint/visitor-keys": "8.62.0", + "@typescript-eslint/project-service": "8.62.1", + "@typescript-eslint/tsconfig-utils": "8.62.1", + "@typescript-eslint/types": "8.62.1", + "@typescript-eslint/visitor-keys": "8.62.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -6797,16 +6797,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.0.tgz", - "integrity": "sha512-82r66fi9zYwZ+mTq3vKgwjbZ1PVk/DJzrXFLpG6RnBbdvH8TEGVHIs9H4d2drhkOzf0syZuD/OZvvlu6GDbP4g==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.1.tgz", + "integrity": "sha512-sHtbPfuKNZCG+ih8SyjjucqRntSVmp8XgL5u6o9mAhiSn8ds5o/M/XdM0abweme2Tln3szOstOrZ9OXitvPh0g==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.62.0", - "@typescript-eslint/types": "8.62.0", - "@typescript-eslint/typescript-estree": "8.62.0" + "@typescript-eslint/scope-manager": "8.62.1", + "@typescript-eslint/types": "8.62.1", + "@typescript-eslint/typescript-estree": "8.62.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6821,13 +6821,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.0.tgz", - "integrity": "sha512-CY3uyFSRbcQv3nnSv8S0+lDftMVz6P963PoRlxrV7ew/Md564g9ut60PYzdLM5qW4jFn93GBF+Soi90ISAN+GQ==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.1.tgz", + "integrity": "sha512-4g3BLxfdTMy8iZG0MaBkadnlRrCJ74cQiFbyEVMrkwIoqdyaXXQM22cotDvrl4x28wgIZ9rEJRoM+mmhSJpJ1g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.62.0", + "@typescript-eslint/types": "8.62.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -14829,16 +14829,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.62.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.62.0.tgz", - "integrity": "sha512-8QxXi+ZACKX0kaqO4gY8kn0RSD9gFfaHDWwjqtEN48aWCBkX4MJaufWN+c3BzlrXLOxfywDL8CaoqUwcRq4j4Q==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.62.1.tgz", + "integrity": "sha512-vymnnM5g0AKQDSAyfP12nMIBvgwgA42syg74kkuZ4x1VuTzwQKwc5h9rGxeShCjny5o+zWAb6OEoz7XLgrIkIw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.62.0", - "@typescript-eslint/parser": "8.62.0", - "@typescript-eslint/typescript-estree": "8.62.0", - "@typescript-eslint/utils": "8.62.0" + "@typescript-eslint/eslint-plugin": "8.62.1", + "@typescript-eslint/parser": "8.62.1", + "@typescript-eslint/typescript-estree": "8.62.1", + "@typescript-eslint/utils": "8.62.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" diff --git a/client/package.json b/client/package.json index 0d6e7a1729..fd734ebf5c 100644 --- a/client/package.json +++ b/client/package.json @@ -140,7 +140,7 @@ "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.62.0" + "typescript-eslint": "^8.62.1" }, "browser": { "fs": false From 12d0d987eca6b28db1cd4fa11007268c1a0fc4eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 18:11:25 +0200 Subject: [PATCH 30/71] Bump js-yaml from 4.2.0 to 5.2.1 in /client (#6357) --- client/package-lock.json | 33 ++++++++++++++++++++++++++++----- client/package.json | 2 +- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 7695e0d5e0..d5c1050f39 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -105,7 +105,7 @@ "eslint-plugin-unused-imports": "^4.4.1", "fetch-mock": "^12.6.0", "jasmine-core": "^5.13.0", - "js-yaml": "^4.2.0", + "js-yaml": "^5.2.1", "karma": "~6.4.4", "karma-chrome-launcher": "~3.2.0", "karma-coverage": "~2.2.1", @@ -2711,6 +2711,29 @@ "node": ">= 4" } }, + "node_modules/@eslint/eslintrc/node_modules/js-yaml": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz", + "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -10665,9 +10688,9 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz", - "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-5.2.1.tgz", + "integrity": "sha512-zfLtNfQqxVqq3uaTqSkh4x4hZw3KHobGUA0fJUj4wawW8bsQLTVqpHdXSIzidh7o+4lEW36tANuAGdaFx6Zgnw==", "dev": true, "funding": [ { @@ -10684,7 +10707,7 @@ "argparse": "^2.0.1" }, "bin": { - "js-yaml": "bin/js-yaml.js" + "js-yaml": "bin/js-yaml.mjs" } }, "node_modules/jsesc": { diff --git a/client/package.json b/client/package.json index fd734ebf5c..8d73ea37b3 100644 --- a/client/package.json +++ b/client/package.json @@ -128,7 +128,7 @@ "eslint-plugin-unused-imports": "^4.4.1", "fetch-mock": "^12.6.0", "jasmine-core": "^5.13.0", - "js-yaml": "^4.2.0", + "js-yaml": "^5.2.1", "karma": "~6.4.4", "karma-chrome-launcher": "~3.2.0", "karma-coverage": "~2.2.1", From 73c8aaf382185d3e4ba42b2e1d5f4048ad92b634 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 16:11:45 +0000 Subject: [PATCH 31/71] Bump prettier from 3.8.4 to 3.9.4 in /client (#6356) --- client/package-lock.json | 8 ++++---- client/package.json | 2 +- .../domain/models/mediafiles/mediafile.constants.ts | 3 +-- .../meeting_user/meeting-user-repository.service.ts | 3 +-- .../amendment-create-wizard.component.scss | 3 +-- .../app/site/pages/meetings/view-models/view-user.ts | 10 ++++------ .../modules/sorting-tree/services/tree.service.ts | 4 ++-- 7 files changed, 14 insertions(+), 19 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index d5c1050f39..1cce6a724e 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -111,7 +111,7 @@ "karma-coverage": "~2.2.1", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.2.0", - "prettier": "^3.8.4", + "prettier": "^3.9.4", "ts-dedent": "^2.3.0", "ts-morph": "^28.0.0", "ts-node": "^10.9.2", @@ -13115,9 +13115,9 @@ } }, "node_modules/prettier": { - "version": "3.8.4", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.4.tgz", - "integrity": "sha512-N2MylSdi48+5N/6S5j+maeHbUSIzzZ5uOcX5Hm4QpV8Dkb1HFjfAKTKX6yNPJQD9AhcT3ifHNB66tWTTJDi11Q==", + "version": "3.9.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.4.tgz", + "integrity": "sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==", "dev": true, "license": "MIT", "bin": { diff --git a/client/package.json b/client/package.json index 8d73ea37b3..eb9bd03aa5 100644 --- a/client/package.json +++ b/client/package.json @@ -134,7 +134,7 @@ "karma-coverage": "~2.2.1", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.2.0", - "prettier": "^3.8.4", + "prettier": "^3.9.4", "ts-dedent": "^2.3.0", "ts-morph": "^28.0.0", "ts-node": "^10.9.2", diff --git a/client/src/app/domain/models/mediafiles/mediafile.constants.ts b/client/src/app/domain/models/mediafiles/mediafile.constants.ts index 4b9c43cd1a..2a5c4df3d6 100644 --- a/client/src/app/domain/models/mediafiles/mediafile.constants.ts +++ b/client/src/app/domain/models/mediafiles/mediafile.constants.ts @@ -39,8 +39,7 @@ export const FONT_PLACES = Object.keys(FontDisplayNames) as FontPlace[]; export type MediafileUsageType = `logo` | `font`; export type ViewMediafileMeetingUsageKey = - | `used_as_logo_${LogoPlace}_in_meeting` - | `used_as_font_${FontPlace}_in_meeting`; + `used_as_logo_${LogoPlace}_in_meeting` | `used_as_font_${FontPlace}_in_meeting`; export type MediafileMeetingUsageIdKey = `${ViewMediafileMeetingUsageKey}_id`; diff --git a/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts b/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts index dbe4dc7860..385287e853 100644 --- a/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts +++ b/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts @@ -9,8 +9,7 @@ import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; export type MeetingUserPatchFn = - | { [key in keyof MeetingUser]?: any } - | ((user: ViewMeetingUser) => { [key in keyof MeetingUser]?: any }); + { [key in keyof MeetingUser]?: any } | ((user: ViewMeetingUser) => { [key in keyof MeetingUser]?: any }); @Injectable({ providedIn: `root` diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.scss index ef15fd4d99..1e8f2d9b28 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.scss @@ -3,8 +3,7 @@ height: calc( 100vh - ( - var(--global-headbar-height) + var(--view-headbar-height) + var(--banner-area-height) - // Offset for the headbars + var(--global-headbar-height) + var(--view-headbar-height) + var(--banner-area-height) // Offset for the headbars + 96px // Offset for the stepper + 20px // Offset for the bottom spacer ) diff --git a/client/src/app/site/pages/meetings/view-models/view-user.ts b/client/src/app/site/pages/meetings/view-models/view-user.ts index 0c1e5cc3ce..304407e3fc 100644 --- a/client/src/app/site/pages/meetings/view-models/view-user.ts +++ b/client/src/app/site/pages/meetings/view-models/view-user.ts @@ -326,12 +326,10 @@ export class ViewUser extends BaseViewModel /* implements Searchable */ { public canVoteForGroups(): Id[] { const delegate = this.vote_delegated_to(this.getEnsuredActiveMeetingId()); const present = this.isPresentInMeeting(); - if ( - !( - present && - (this.isSelfVotingAllowedDespiteDelegation() || !(this.getDelegationSettingEnabled() && delegate)) - ) - ) { + if (!( + present && + (this.isSelfVotingAllowedDespiteDelegation() || !(this.getDelegationSettingEnabled() && delegate)) + )) { return []; } return Array.from( diff --git a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts index b2c0f1e984..021ffac86b 100644 --- a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts +++ b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts @@ -110,7 +110,7 @@ export class TreeService { public makeTreeFromFlatTree(nodes: FlatNode[]): TreeIdNode[] { const basicTree: TreeIdNode[] = []; - for (let i = 0; i < nodes.length; ) { + for (let i = 0; i < nodes.length;) { // build the next node inclusive its children const nextNode = this.buildBranchFromFlatTree(nodes[i], nodes, 0); // append this node to the tree @@ -309,7 +309,7 @@ export class TreeService { tree = tree.sort((a, b) => a.position != null && b.position != null ? a.position - b.position : b != null ? -1 : 0 ); - for (let i = 0; i < tree.length; ) { + for (let i = 0; i < tree.length;) { const node = tree[i]; if (findIndexInSortedArray(deleteIds, byItemId ? node.item.id : node.id, (a, b) => a - b) !== -1) { tree = [tree.slice(0, i), i + 1 < tree.length ? tree.slice(i + 1) : []].flatMap( From 613109aab40284ab155f25b75ece4fbaec549c89 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Mon, 6 Jul 2026 18:15:14 +0200 Subject: [PATCH 32/71] Add `typescript-eslint` to group (#6361) --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 16c6198b2f..c04043242a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,6 +12,7 @@ updates: typescript-eslint: patterns: - "@typescript-eslint/*" + - "typescript-eslint" opentelemetry: patterns: - "@opentelemetry/*" From 824bde1600ddac74e78cb19a339c7956d9a1d78d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 16:27:12 +0000 Subject: [PATCH 33/71] Bump @coreui/angular-chartjs from 5.6.24 to 5.6.25 in /client (#6362) --- client/package-lock.json | 11 +++++------ client/package.json | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 1cce6a724e..69f4fa2270 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -22,7 +22,6 @@ "@angular/router": "^21.2.17", "@angular/service-worker": "^21.2.17", "@cantoo/pdf-lib": "^2.7.1", - "@coreui/angular-chartjs": "~5.6.24", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", "@intevation/tiptap-extension-office-paste": "^0.1.2", @@ -84,7 +83,7 @@ "@angular/cli": "^21.2.18", "@angular/compiler-cli": "^21.2.17", "@angular/language-server": "^21.2.17", - "@coreui/angular-chartjs": "^5.6.24", + "@coreui/angular-chartjs": "^5.6.25", "@stylistic/eslint-plugin": "^5.10.0", "@types/file-saver": "^2.0.7", "@types/jasmine": "~5.1.15", @@ -1993,9 +1992,9 @@ } }, "node_modules/@coreui/angular-chartjs": { - "version": "5.6.24", - "resolved": "https://registry.npmjs.org/@coreui/angular-chartjs/-/angular-chartjs-5.6.24.tgz", - "integrity": "sha512-vfHUznw3+Lg5xm21fu8DN9Fa9NWqJHWhhf3OJJ9JPgGPAp4fHXmNTpy05gg6ikdcW7gV6ycmf0JMFwIrt7duLg==", + "version": "5.6.25", + "resolved": "https://registry.npmjs.org/@coreui/angular-chartjs/-/angular-chartjs-5.6.25.tgz", + "integrity": "sha512-xab538rl0b5xfRJjQqYspZ/NoJqrwqcVBpoR4o1C9ZEGyMrSc34O+nzjjUIoFeO+TY8ktGz517gunKFVfn6NZw==", "dev": true, "license": "MIT", "dependencies": { @@ -2003,7 +2002,7 @@ "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/core": "^21.2.14", + "@angular/core": "^21.2.17", "@coreui/chartjs": "^4.1.0", "chart.js": "^4.5.0" } diff --git a/client/package.json b/client/package.json index eb9bd03aa5..021df6f3dd 100644 --- a/client/package.json +++ b/client/package.json @@ -45,7 +45,7 @@ "@angular/router": "^21.2.17", "@angular/service-worker": "^21.2.17", "@cantoo/pdf-lib": "^2.7.1", - "@coreui/angular-chartjs": "~5.6.24", + "@coreui/angular-chartjs": "~5.6.25", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", "@intevation/tiptap-extension-office-paste": "^0.1.2", @@ -107,7 +107,7 @@ "@angular/cli": "^21.2.18", "@angular/compiler-cli": "^21.2.17", "@angular/language-server": "^21.2.17", - "@coreui/angular-chartjs": "^5.6.24", + "@coreui/angular-chartjs": "^5.6.25", "@stylistic/eslint-plugin": "^5.10.0", "@types/file-saver": "^2.0.7", "@types/jasmine": "~5.1.15", From 2437fbef57e2cf978090020d50410115e26721d0 Mon Sep 17 00:00:00 2001 From: "openslides-automation[bot]" <125256978+openslides-automation[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 11:26:26 +0200 Subject: [PATCH 34/71] Update meta repository (#6359) \ --- meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta b/meta index 7f0f4fe86d..8d674fe32c 160000 --- a/meta +++ b/meta @@ -1 +1 @@ -Subproject commit 7f0f4fe86d179bc0bf07cecbcce508cec72922f6 +Subproject commit 8d674fe32cbadef2d572f11abf4cfa81f09c94e1 From 8127ed06051f8417845be4e7d62dcf886ed7cb20 Mon Sep 17 00:00:00 2001 From: Loki Elble <69210919+Elblinator@users.noreply.github.com> Date: Wed, 8 Jul 2026 09:27:14 +0200 Subject: [PATCH 35/71] Fix reason string and motion-list url (#6375) --- .../components/motion-content/motion-content.component.html | 2 +- .../components/motion-list/motion-list.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.html index 9abdf193ff..9fa22beebf 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.html @@ -65,7 +65,7 @@ @if (showReason) {
-

{{ 'Reason text' | translate }}

+

{{ 'Reason' | translate }}

} diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.html index 1824d136f7..eca3ab2bd8 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.html @@ -125,7 +125,7 @@

Motions

}

- + @if (motion.getPersonalNote()?.star) { From 434b9e7c3991b42c6a5e6b46264963feb1772e87 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Wed, 8 Jul 2026 11:22:26 +0200 Subject: [PATCH 36/71] Revert changes from #5997 and #5693 (#6285) --- .../motion-content.component.scss | 18 --------------- .../paragraph-based-amendment.component.html | 2 +- .../paragraph-based-amendment.component.scss | 6 ----- .../motions/styles/motion-common-styles.scss | 22 ------------------- client/src/assets/styles/reason.scss | 5 ----- client/src/styles.scss | 1 - 6 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 client/src/assets/styles/reason.scss diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.scss index 4cd90f6330..e246d0033f 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.scss @@ -1,6 +1,4 @@ @use 'src/assets/styles/mixins/detail-view-appearance.scss'; -@use 'src/assets/styles/variables.scss'; - .extra-data { display: flex; flex-direction: column; @@ -8,22 +6,6 @@ } .motion-content { - div > div { - @include variables.desktop { - max-width: 82%; - } - @include variables.phone { - max-width: 100%; - display: block; - word-break: break-all; - } - @include variables.tablet { - max-width: 100%; - display: block; - word-break: break-all; - } - max-width: inherit; - } h3 { font-weight: bold; } diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/paragraph-based-amendment/paragraph-based-amendment.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/paragraph-based-amendment/paragraph-based-amendment.component.html index 4817b2fd55..d981779a3d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/paragraph-based-amendment/paragraph-based-amendment.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/paragraph-based-amendment/paragraph-based-amendment.component.html @@ -122,7 +122,7 @@

@if (changeRecoMode === ChangeRecoMode.Original || changeRecoMode === ChangeRecoMode.Changed) { -
+
@if (motion && motion.isParagraphBasedAmendment() && motion.lead_motion) { {{ 'Show entire motion text' | translate }} diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/paragraph-based-amendment/paragraph-based-amendment.component.scss b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/paragraph-based-amendment/paragraph-based-amendment.component.scss index 634ca90e1b..218d7e307a 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/paragraph-based-amendment/paragraph-based-amendment.component.scss +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/paragraph-based-amendment/paragraph-based-amendment.component.scss @@ -6,9 +6,3 @@ .motion-text > os-motion-detail-diff { margin-left: -40px; } - -.show-full-motion { - display: flex; - justify-content: flex-end; - padding-right: 10px; -} diff --git a/client/src/app/site/pages/meetings/pages/motions/styles/motion-common-styles.scss b/client/src/app/site/pages/meetings/pages/motions/styles/motion-common-styles.scss index a6fb8e208e..82af66d8fc 100644 --- a/client/src/app/site/pages/meetings/pages/motions/styles/motion-common-styles.scss +++ b/client/src/app/site/pages/meetings/pages/motions/styles/motion-common-styles.scss @@ -1,5 +1,4 @@ @use 'src/assets/styles/mixins/detail-view-appearance.scss'; -@use 'src/assets/styles/variables.scss'; .motion-text { ins, @@ -122,27 +121,6 @@ } } -@include variables.desktop { - .motion-text > * { - max-width: 100%; - word-break: break-all; - } -} -@include variables.phone { - .motion-text > * { - max-width: 100%; - display: block; - word-break: break-all; - } -} -@include variables.tablet { - .motion-text > * { - max-width: 100%; - display: block; - word-break: break-all; - } -} - .amendment-view { .os-split-after { margin-bottom: 0; diff --git a/client/src/assets/styles/reason.scss b/client/src/assets/styles/reason.scss deleted file mode 100644 index 2763702f82..0000000000 --- a/client/src/assets/styles/reason.scss +++ /dev/null @@ -1,5 +0,0 @@ -.motion-text p { - word-break: keep-all !important; - overflow-wrap: break-word; - white-space: collapse; -} \ No newline at end of file diff --git a/client/src/styles.scss b/client/src/styles.scss index 0b76149678..3feea35ed2 100644 --- a/client/src/styles.scss +++ b/client/src/styles.scss @@ -4,7 +4,6 @@ /** angular material theming */ @use 'sass:meta'; @use 'assets/styles/theme-styles.scss'; -@use 'assets/styles/reason.scss'; /** Useful default classes */ @use 'assets/styles/default-classes.scss'; From 7dc7f7b091036a6def0fe7a8669677c2f41de971 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Wed, 8 Jul 2026 13:41:41 +0200 Subject: [PATCH 37/71] Remove empty spec files (#6378) --- .../app/gateways/auth-adapter.service.spec.ts | 19 ------------------ .../csv-export.service.spec.ts | 20 ------------------- .../file-export.service.spec.ts | 20 ------------------- .../pdf-document.service.spec.ts | 16 --------------- ...progress-snack-bar-control.service.spec.ts | 16 --------------- .../progress-snack-bar.service.spec.ts | 16 --------------- .../xlsx-export.service.spec.ts | 16 --------------- client/src/app/gateways/http.service.spec.ts | 16 --------------- .../src/app/gateways/notify.service.spec.ts | 16 --------------- .../action-worker-repository.service.spec.ts | 16 --------------- .../agenda-item-repository.service.spec.ts | 16 --------------- ...nment-candidate-repository.service.spec.ts | 16 --------------- .../assignment-repository.service.spec.ts | 16 --------------- .../chat-group-repository.service.spec.ts | 16 --------------- .../chat-message-repository.service.spec.ts | 16 --------------- .../committee-repository.service.spec.ts | 16 --------------- .../gender/gender-repository.service.spec.ts | 16 --------------- .../groups/group-repository.service.spec.ts | 16 --------------- .../history-entry-repository.service.spec.ts | 16 --------------- ...istory-position-repository.service.spec.ts | 16 --------------- ...ist-of-speakers-repository.service.spec.ts | 16 --------------- .../mediafile-repository.service.spec.ts | 16 --------------- ...eting-mediafile-repository.service.spec.ts | 16 --------------- .../meeting-repository.service.spec.ts | 16 --------------- .../meeting-user-repository.service.spec.ts | 16 --------------- .../motion-block-repository.service.spec.ts | 16 --------------- ...motion-category-repository.service.spec.ts | 16 --------------- ...-recommendation-repository.service.spec.ts | 16 --------------- .../motion-comment-repository.service.spec.ts | 16 --------------- ...comment-section-repository.service.spec.ts | 16 --------------- .../motion-editor-repository.service.spec.ts | 16 --------------- .../motion-repository.service.spec.ts | 16 --------------- .../motion-state-repository.service.spec.ts | 16 --------------- ...otion-submitter-repository.service.spec.ts | 16 --------------- ...otion-supporter-repository.service.spec.ts | 16 --------------- ...motion-workflow-repository.service.spec.ts | 16 --------------- ...g-group-speaker-repository.service.spec.ts | 16 --------------- .../personal-note-repository.service.spec.ts | 16 --------------- .../organization-repository.service.spec.ts | 16 --------------- ...rganization-tag-repository.service.spec.ts | 16 --------------- ...-order-category-repository.service.spec.ts | 16 --------------- ...-candidate-list-repository.service.spec.ts | 16 --------------- .../poll-candidate-repository.service.spec.ts | 16 --------------- .../option-repository.service.spec.ts | 16 --------------- .../poll-repository.service.spec.ts | 16 --------------- .../vote-repository.service.spec.ts | 16 --------------- .../projection-repository.service.spec.ts | 16 --------------- ...ector-countdown-repository.service.spec.ts | 16 --------------- ...ojector-message-repository.service.spec.ts | 16 --------------- .../projector-repository.service.spec.ts | 16 --------------- .../speaker-repository.service.spec.ts | 16 --------------- ...ist-of-speakers-repository.service.spec.ts | 16 --------------- ...structure-level-repository.service.spec.ts | 16 --------------- .../tags/tag-repository.service.spec.ts | 16 --------------- .../themes/theme-repository.service.spec.ts | 16 --------------- .../topics/topic-repository.service.spec.ts | 16 --------------- .../users/user-repository.service.spec.ts | 16 --------------- .../auth-token.interceptor.spec.ts | 16 --------------- .../services/app-load.service.spec.ts | 19 ------------------ .../services/dom.service.spec.ts | 16 --------------- client/src/app/site/guards/auth.guard.spec.ts | 16 --------------- .../app/site/guards/permission.guard.spec.ts | 16 --------------- .../guards/watch-for-changes.guard.spec.ts | 16 --------------- .../services/spinner.service.spec.ts | 16 --------------- .../services/banner.service.spec.ts | 16 --------------- .../services/update.service.spec.ts | 16 --------------- .../services/voting-banner.service.spec.ts | 16 --------------- .../user-delete-dialog.service.spec.ts | 16 --------------- .../wait-for-action-dialog.service.spec.ts | 16 --------------- .../services/browser-support.service.spec.ts | 16 --------------- .../point-of-order-dialog.service.spec.ts | 16 --------------- ...speaker-user-select-dialog.service.spec.ts | 16 --------------- ...agenda-content-object-form.service.spec.ts | 16 --------------- .../services/projectable-list.service.spec.ts | 16 --------------- .../projection-dialog.service.spec.ts | 16 --------------- ...ing-privacy-warning-dialog.service.spec.ts | 16 --------------- .../poll-controller.service.spec.ts | 16 --------------- .../poll-dialog.service.spec.ts | 16 --------------- .../poll-service-mapper.service.spec.ts | 16 --------------- .../vote-controller.service.spec.ts | 16 --------------- .../voting.service/voting.service.spec.ts | 16 --------------- ...ent-list-of-speakers-slide.service.spec.ts | 16 --------------- .../current-list-of-speakers.service.spec.ts | 16 --------------- ...ist-of-speakers-controller.service.spec.ts | 16 --------------- ...-order-category-controller.service.spec.ts | 16 --------------- .../speaker-controller.service.spec.ts | 16 --------------- .../topic-poll-dialog.service.spec.ts | 16 --------------- .../services/topic-poll.service.spec.ts | 16 --------------- .../topic-export.service.spec.ts | 16 --------------- .../topic-import.service.spec.ts | 16 --------------- .../topic-controller.service.spec.ts | 16 --------------- .../agenda-item-export.service.spec.ts | 16 --------------- .../agenda-item-filter.service.spec.ts | 16 --------------- .../agenda-item-multiselect.service.spec.ts | 20 ------------------- .../agenda-item-controller.service.spec.ts | 16 --------------- .../agenda-pdf-catalog-export.service.spec.ts | 16 --------------- .../assignment-poll-dialog.service.spec.ts | 16 --------------- .../assignment-poll-pdf.service.spec.ts | 16 --------------- .../services/assignment-poll.service.spec.ts | 16 --------------- ...nment-candidate-controller.service.spec.ts | 16 --------------- .../assignment-filter-list.service.spec.ts | 16 --------------- .../assignment-sort-list.service.spec.ts | 16 --------------- .../assignment-controller.service.spec.ts | 16 --------------- .../assignment-export.service.spec.ts | 16 --------------- .../services/assignment-pdf.service.spec.ts | 16 --------------- .../chat-group-dialog.service.spec.ts | 16 --------------- .../chat-group-controller.service.spec.ts | 16 --------------- .../chat-message-controller.service.spec.ts | 16 --------------- .../chat-notification.service.spec.ts | 16 --------------- .../pages/chat/services/chat.service.spec.ts | 16 --------------- .../count-users-statistics.service.spec.ts | 16 --------------- .../services/applause.service.spec.ts | 16 --------------- .../services/broadcast.service.spec.ts | 16 --------------- .../services/call-restriction.service.spec.ts | 16 --------------- .../interaction-receive.service.spec.ts | 16 --------------- .../services/interaction.service.spec.ts | 16 --------------- .../operator-media-permission.service.spec.ts | 16 --------------- .../interaction/services/rtc.service.spec.ts | 16 --------------- .../services/stream.service.spec.ts | 16 --------------- .../mediafile-list-export.service.spec.ts | 16 --------------- .../mediafile-list-group.service.spec.ts | 16 --------------- .../services/mediafile-common.service.spec.ts | 16 --------------- .../mediafile-controller.service.spec.ts | 16 --------------- .../motion-forward-dialog.service.spec.ts | 16 --------------- .../motion-multiselect.service.spec.ts | 16 --------------- ...motion-category-controller.service.spec.ts | 16 --------------- ...-recommendation-controller.service.spec.ts | 16 --------------- .../motion-comment-controller.service.spec.ts | 16 --------------- ...comment-section-controller.service.spec.ts | 16 --------------- .../motion-editor-controller.service.spec.ts | 16 --------------- .../motion-block-controller.service.spec.ts | 16 --------------- .../motion-poll-controller.service.spec.ts | 16 --------------- .../motion-poll-dialog.service.spec.ts | 16 --------------- .../motion-poll-pdf.service.spec.ts | 16 --------------- .../motion-poll.service.spec.ts | 16 --------------- .../personal-note-controller.service.spec.ts | 16 --------------- .../motion-state-controller.service.spec.ts | 16 --------------- ...otion-submitter-controller.service.spec.ts | 16 --------------- .../motion-supporter-controller.spec.ts | 16 --------------- .../tag-controller.service.spec.ts | 16 --------------- ...motion-workflow-controller.service.spec.ts | 16 --------------- ...g-group-speaker-controller.service.spec.ts | 16 --------------- ...motion-block-create-dialog.service.spec.ts | 16 --------------- .../motion-block-edit-dialog.service.spec.ts | 16 --------------- ...n-block-detail-filter-list.service.spec.ts | 16 --------------- .../motion-block-sort.service.spec.ts | 16 --------------- ...ange-recommendation-dialog.service.spec.ts | 16 --------------- .../motion-detail-view.service.spec.ts | 16 --------------- .../motion-list-info-dialog.service.spec.ts | 16 --------------- .../workflow-export.service.spec.ts | 16 --------------- .../amendment-controller.service.spec.ts | 16 --------------- .../motion-controller.service.spec.ts | 16 --------------- .../motion-format.service.spec.ts | 16 --------------- .../motion-line-numbering.service.spec.ts | 16 --------------- .../motion-permission.service.spec.ts | 16 --------------- .../amendment-list-pdf.service.spec.ts | 16 --------------- .../motion-csv-export.service.spec.ts | 16 --------------- .../motion-export.service.spec.ts | 16 --------------- .../motion-html-to-pdf.service.spec.ts | 16 --------------- .../motion-pdf-catalog.service.spec.ts | 16 --------------- .../motion-pdf-export.service.spec.ts | 16 --------------- .../motion-pdf.service.spec.ts | 16 --------------- .../motion-xlsx-export.service.spec.ts | 16 --------------- .../amendment-list-filter.service.spec.ts | 16 --------------- .../amendment-list-sort.service.spec.ts | 16 --------------- .../motion-list-base-sort.service.spec.ts | 16 --------------- .../motion-list-filter.service.spec.ts | 16 --------------- .../motion-list-sort.service.spec.ts | 16 --------------- .../participant-csv-export.service.spec.ts | 16 --------------- .../participant-pdf-export.service.spec.ts | 16 --------------- .../participant-pdf.service.spec.ts | 16 --------------- .../speaker-csv-export.service.spec.ts | 16 --------------- .../services/group-controller.service.spec.ts | 16 --------------- .../participant-import.service.spec.ts | 16 --------------- ...rticipant-list-info-dialog.service.spec.ts | 16 --------------- .../participant-list-filter.service.spec.ts | 16 --------------- .../participant-list-sort.service.spec.ts | 16 --------------- ...cipant-speaker-list-filter.service.spec.ts | 16 --------------- ...ticipant-speaker-list-sort.service.spec.ts | 16 --------------- .../participant-controller.service.spec.ts | 16 --------------- .../poll-list-filter.service.spec.ts | 16 --------------- ...projector-countdown-dialog.service.spec.ts | 16 --------------- .../projector-edit-dialog.service.spec.ts | 16 --------------- .../projector-message-dialog.service.spec.ts | 16 --------------- ...rrent-speaker-chyron-slide.service.spec.ts | 16 --------------- .../projection-controller.service.spec.ts | 16 --------------- ...ector-countdown-controller.service.spec.ts | 16 --------------- ...ojector-message-controller.service.spec.ts | 16 --------------- .../projector-controller.service.spec.ts | 16 --------------- .../active-meeting-id.service.spec.ts | 16 --------------- .../services/active-meeting.service.spec.ts | 16 --------------- .../services/archive-status.service.spec.ts | 16 --------------- ...ing-csv-export-for-backend.service.spec.ts | 16 --------------- .../export/meeting-csv-export.service.spec.ts | 16 --------------- .../export/meeting-pdf-export.service.spec.ts | 16 --------------- .../services/load-font.service.spec.ts | 16 --------------- .../services/media-manage.service.spec.ts | 16 --------------- .../meeting-collection-mapper.service.spec.ts | 16 --------------- ...omponent-service-collector.service.spec.ts | 16 --------------- ...ntroller-service-collector.service.spec.ts | 16 --------------- .../meeting-data-store.service.spec.ts | 16 --------------- .../services/meeting-settings.service.spec.ts | 16 --------------- .../sequential-number-mapping.service.spec.ts | 16 --------------- .../account-import.service.spec.ts | 16 --------------- .../account-list-search.service.spec.ts | 16 --------------- .../account-sort.service.spec.ts | 16 --------------- .../gender-controller.service.spec.ts | 16 --------------- .../account-export.service.spec.ts | 16 --------------- .../common/account-controller.service.spec.ts | 16 --------------- .../common/account-filter.service.spec.ts | 16 --------------- .../modules/services/meeting.service.spec.ts | 16 --------------- .../committee-import.service.spec.ts | 16 --------------- .../committee-export.service.spec.ts | 16 --------------- .../committee-filter.service.spec.ts | 16 --------------- .../committee-sort.service.spec.ts | 16 --------------- .../committee-controller.service.spec.ts | 16 --------------- .../theme-builder-dialog.service.spec.ts | 16 --------------- .../services/theme-controller.service.spec.ts | 16 --------------- .../meeting-list-filter.service.spec.ts | 16 --------------- .../meeting-list-sort.service.spec.ts | 16 --------------- .../organization-tag-dialog.service.spec.ts | 16 --------------- ...rganization-tag-controller.service.spec.ts | 16 --------------- .../organization-controller.service.spec.ts | 16 --------------- .../organization-settings.service.spec.ts | 16 --------------- .../services/organization.service.spec.ts | 16 --------------- .../site/services/auth-check.service.spec.ts | 16 --------------- .../app/site/services/auth.service.spec.ts | 16 --------------- .../autoupdate/autoupdate.service.spec.ts | 16 --------------- .../collection-mapper.service.spec.ts | 16 --------------- ...omponent-service-collector.service.spec.ts | 16 --------------- ...ntroller-service-collector.service.spec.ts | 16 --------------- .../data-store-update-manager.service.spec.ts | 16 --------------- .../site/services/data-store.service.spec.ts | 16 --------------- .../import-service-collector.service.spec.ts | 16 --------------- .../model-request-builder.service.spec.ts | 16 --------------- .../services/model-request.service.spec.ts | 16 --------------- .../openslides-router.service.spec.ts | 16 --------------- .../site/services/openslides.service.spec.ts | 16 --------------- .../site/services/operator.service.spec.ts | 16 --------------- .../services/relation-manager.service.spec.ts | 16 --------------- .../app/site/services/reroute.service.spec.ts | 16 --------------- .../services/user-controller.service.spec.ts | 16 --------------- .../app/site/services/user.service.spec.ts | 16 --------------- .../view-model-store-update.service.spec.ts | 16 --------------- .../site/services/view-port.service.spec.ts | 16 --------------- .../services/choice.service.spec.ts | 16 --------------- .../services/routing-state.service.spec.ts | 16 --------------- .../services/overlay.service.spec.ts | 16 --------------- .../services/prompt.service.spec.ts | 16 --------------- .../scrolling-table-manage.service.spec.ts | 16 --------------- ...aster-egg-content-platform.service.spec.ts | 16 --------------- .../services/tree.service.spec.ts | 16 --------------- 252 files changed, 4050 deletions(-) delete mode 100644 client/src/app/gateways/auth-adapter.service.spec.ts delete mode 100644 client/src/app/gateways/export/csv-export.service/csv-export.service.spec.ts delete mode 100644 client/src/app/gateways/export/file-export.service/file-export.service.spec.ts delete mode 100644 client/src/app/gateways/export/pdf-document.service/pdf-document.service.spec.ts delete mode 100644 client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar-control.service.spec.ts delete mode 100644 client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar.service.spec.ts delete mode 100644 client/src/app/gateways/export/xlsx-export.service/xlsx-export.service.spec.ts delete mode 100644 client/src/app/gateways/http.service.spec.ts delete mode 100644 client/src/app/gateways/notify.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/action-worker/action-worker-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/agenda/agenda-item-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/assignments/assignment-candidate-repository.service/assignment-candidate-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/assignments/assignment-repository.service/assignment-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/chat/chat-group-repository.service/chat-group-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/chat/chat-message-repository.service/chat-message-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/committee-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/gender/gender-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/groups/group-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/history-entry/history-entry-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/history-position/history-position-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/mediafiles/mediafile-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/meeting-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/motion-block-repository.service/motion-block-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/motion-category-repository.service/motion-category-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/motion-change-recommendation-repository.service/motion-change-recommendation-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/motion-comments/motion-comment-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/motion-comments/motion-comment-section-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/motion-editor-repository/motion-editor-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/motion-state-repository.service/motion-state-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/motion-submitter-repository.service/motion-submitter-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/motion-supporter/motion-supporter-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/motion-workflow-repository.service/motion-workflow-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/motion-working-group-speaker-repository/motion-working-group-speaker-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/motions/personal-note-repository.service/personal-note-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/organization-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/organization-tags/organization-tag-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/projections/projection-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/projectors/projector-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/speakers/speaker-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/tags/tag-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/themes/theme-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/topics/topic-repository.service.spec.ts delete mode 100644 client/src/app/gateways/repositories/users/user-repository.service.spec.ts delete mode 100644 client/src/app/openslides-main-module/interceptors/auth-token.interceptor.spec.ts delete mode 100644 client/src/app/openslides-main-module/services/app-load.service.spec.ts delete mode 100644 client/src/app/openslides-main-module/services/dom.service.spec.ts delete mode 100644 client/src/app/site/guards/auth.guard.spec.ts delete mode 100644 client/src/app/site/guards/permission.guard.spec.ts delete mode 100644 client/src/app/site/guards/watch-for-changes.guard.spec.ts delete mode 100644 client/src/app/site/modules/global-spinner/services/spinner.service.spec.ts delete mode 100644 client/src/app/site/modules/site-wrapper/services/banner.service.spec.ts delete mode 100644 client/src/app/site/modules/site-wrapper/services/update.service.spec.ts delete mode 100644 client/src/app/site/modules/site-wrapper/services/voting-banner.service.spec.ts delete mode 100644 client/src/app/site/modules/user-components/services/user-delete-dialog.service.spec.ts delete mode 100644 client/src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/login/services/browser-support.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/services/point-of-order-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/services/speaker-user-select-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/services/agenda-content-object-form.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/services/projectable-list.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/modules/poll/services/poll-dialog.service/poll-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/modules/poll/services/poll-service-mapper.service/poll-service-mapper.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/point-of-order-category-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-export.service/topic-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-import.service/topic-import.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-controller.service/topic-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-export.service/agenda-item-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-filter.service/agenda-item-filter.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-multiselect.service/agenda-item-multiselect.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/services/agenda-item-controller.service/agenda-item-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-pdf.service/assignment-poll-pdf.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/services/assignment-candidate-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-filter-list.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-sort-list.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/assignments/services/assignment-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/assignments/services/assignment-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/assignments/services/assignment-pdf.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/services/chat-group-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/chat/services/chat-group-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/chat/services/chat-message-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/chat/services/chat-notification.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/chat/services/chat.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/home/pages/meeting-info/services/count-users-statistics.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/interaction/services/applause.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/interaction/services/broadcast.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/interaction/services/call-restriction.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/interaction/services/interaction-receive.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/interaction/services/interaction.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/interaction/services/operator-media-permission.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/interaction/services/rtc.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/interaction/services/stream.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-group.service/mediafile-list-group.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/services/motion-forward-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/categories/services/motion-category-controller.service/motion-category-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-section-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/editors/services/motion-editor-controller/motion-editor-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/services/motion-block-controller.service/motion-block-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-dialog.service/motion-poll-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-pdf.service/motion-poll-pdf.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/states/services/motion-state-controller.service/motion-state-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/submitters/services/motion-submitter-controller/motion-submitter-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/supporters/services/motion-supporter-controller/motion-supporter-controller.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/tags/services/tag-controller.service/tag-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/workflows/services/motion-workflow-controller.service/motion-workflow-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/services/motion-working-group-speaker-controller/motion-working-group-speaker-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/services/motion-block-create-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/services/motion-block-edit-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-detail-filter-list.service/motion-block-detail-filter-list.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-sort.service/motion-block-sort.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/services/motion-change-recommendation-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/services/motion-detail-view.service/motion-detail-view.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/services/motion-list-info-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/pages/workflows/services/workflow-export.service/workflow-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/common/motion-controller.service/motion-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/common/motion-format.service/motion-format.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/common/motion-line-numbering.service/motion-line-numbering.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/export/amendment-list-pdf.service/amendment-list-pdf.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/export/motion-export.service/motion-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/export/motion-html-to-pdf.service/motion-html-to-pdf.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-catalog.service/motion-pdf-catalog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-export.service/motion-pdf-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf.service/motion-pdf.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/export/motion-xlsx-export.service/motion-xlsx-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-filter.service/amendment-list-filter.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-sort.service/amendment-list-sort.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-base-sort.service/motion-list-base-sort.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-filter.service/motion-list-filter.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-sort.service/motion-list-sort.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/participants/export/participant-pdf-export.service/participant-pdf-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/participants/export/participant-pdf.service/participant-pdf.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/participants/export/speaker-csv-export.service/speaker-csv-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/participants/modules/groups/services/group-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/participants/pages/participant-import/services/participant-import.service/participant-import.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-filter.service/participant-speaker-list-filter.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-sort.service/participant-speaker-list-sort.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/services/projector-countdown-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/services/projector-edit-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/services/projector-message-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/current-speaker-chyron-slide.service/current-speaker-chyron-slide.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projection-controller.service/projection-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-countdown-controller.service/projector-countdown-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-message-controller.service/projector-message-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/pages/projectors/services/projector-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/active-meeting-id.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/active-meeting.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/archive-status.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/export/meeting-csv-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/export/meeting-pdf-export.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/load-font.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/media-manage.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/meeting-collection-mapper.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/meeting-controller-service-collector.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/meeting-data-store.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/meeting-settings.service.spec.ts delete mode 100644 client/src/app/site/pages/meetings/services/sequential-number-mapping.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-search/account-list-search.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/accounts/services/common/account-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/accounts/services/common/account-filter.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-filter.service/committee-filter.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/committees/services/committee-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/services/theme-builder-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/designs/services/theme-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-filter/meeting-list-filter.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-sort/meeting-list-sort.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/services/organization-tag-dialog.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service/organization-tag-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/services/organization-controller.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/services/organization-settings.service.spec.ts delete mode 100644 client/src/app/site/pages/organization/services/organization.service.spec.ts delete mode 100644 client/src/app/site/services/auth-check.service.spec.ts delete mode 100644 client/src/app/site/services/auth.service.spec.ts delete mode 100644 client/src/app/site/services/autoupdate/autoupdate.service.spec.ts delete mode 100644 client/src/app/site/services/collection-mapper.service/collection-mapper.service.spec.ts delete mode 100644 client/src/app/site/services/component-service-collector.service.spec.ts delete mode 100644 client/src/app/site/services/controller-service-collector.service.spec.ts delete mode 100644 client/src/app/site/services/data-store-update-manager.service.spec.ts delete mode 100644 client/src/app/site/services/data-store.service.spec.ts delete mode 100644 client/src/app/site/services/import-service-collector.service.spec.ts delete mode 100644 client/src/app/site/services/model-request-builder/model-request-builder.service.spec.ts delete mode 100644 client/src/app/site/services/model-request.service.spec.ts delete mode 100644 client/src/app/site/services/openslides-router.service.spec.ts delete mode 100644 client/src/app/site/services/openslides.service.spec.ts delete mode 100644 client/src/app/site/services/operator.service.spec.ts delete mode 100644 client/src/app/site/services/relation-manager.service.spec.ts delete mode 100644 client/src/app/site/services/reroute.service.spec.ts delete mode 100644 client/src/app/site/services/user-controller.service.spec.ts delete mode 100644 client/src/app/site/services/user.service.spec.ts delete mode 100644 client/src/app/site/services/view-model-store-update.service.spec.ts delete mode 100644 client/src/app/site/services/view-port.service.spec.ts delete mode 100644 client/src/app/ui/modules/choice-dialog/services/choice.service.spec.ts delete mode 100644 client/src/app/ui/modules/head-bar/services/routing-state.service.spec.ts delete mode 100644 client/src/app/ui/modules/openslides-overlay/services/overlay.service.spec.ts delete mode 100644 client/src/app/ui/modules/prompt-dialog/services/prompt.service.spec.ts delete mode 100644 client/src/app/ui/modules/scrolling-table/services/scrolling-table-manage.service.spec.ts delete mode 100644 client/src/app/ui/modules/sidenav/modules/easter-egg/services/easter-egg-content-platform.service.spec.ts delete mode 100644 client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.spec.ts diff --git a/client/src/app/gateways/auth-adapter.service.spec.ts b/client/src/app/gateways/auth-adapter.service.spec.ts deleted file mode 100644 index 892ad5fc76..0000000000 --- a/client/src/app/gateways/auth-adapter.service.spec.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { E2EImportsModule } from 'src/e2e-imports.module'; - -import { AuthAdapterService } from './auth-adapter.service'; - -xdescribe(`AuthAdapterService`, () => { - let service: AuthAdapterService; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [E2EImportsModule] - }); - service = TestBed.inject(AuthAdapterService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/export/csv-export.service/csv-export.service.spec.ts b/client/src/app/gateways/export/csv-export.service/csv-export.service.spec.ts deleted file mode 100644 index 903c59e423..0000000000 --- a/client/src/app/gateways/export/csv-export.service/csv-export.service.spec.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { E2EImportsModule } from 'src/e2e-imports.module'; - -import { ExportServiceModule } from '../export-service.module'; -import { CsvExportService } from './csv-export.service'; - -xdescribe(`CsvExportService`, () => { - let service: CsvExportService; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [E2EImportsModule, ExportServiceModule] - }); - service = TestBed.inject(CsvExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/export/file-export.service/file-export.service.spec.ts b/client/src/app/gateways/export/file-export.service/file-export.service.spec.ts deleted file mode 100644 index 21bf3615cb..0000000000 --- a/client/src/app/gateways/export/file-export.service/file-export.service.spec.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { E2EImportsModule } from 'src/e2e-imports.module'; - -import { ExportServiceModule } from '../export-service.module'; -import { FileExportService } from './file-export.service'; - -xdescribe(`FileExportService`, () => { - let service: FileExportService; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [E2EImportsModule, ExportServiceModule] - }); - service = TestBed.inject(FileExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/export/pdf-document.service/pdf-document.service.spec.ts b/client/src/app/gateways/export/pdf-document.service/pdf-document.service.spec.ts deleted file mode 100644 index be65bef858..0000000000 --- a/client/src/app/gateways/export/pdf-document.service/pdf-document.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PdfDocumentService } from './pdf-document.service'; - -xdescribe(`PdfDocumentService`, () => { - let service: PdfDocumentService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PdfDocumentService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar-control.service.spec.ts b/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar-control.service.spec.ts deleted file mode 100644 index d6eadf3906..0000000000 --- a/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar-control.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProgressSnackBarControlService } from './progress-snack-bar-control.service'; - -xdescribe(`ProgressSnackBarControlService`, () => { - let service: ProgressSnackBarControlService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProgressSnackBarControlService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar.service.spec.ts b/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar.service.spec.ts deleted file mode 100644 index baf635bc38..0000000000 --- a/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProgressSnackBarService } from './progress-snack-bar.service'; - -xdescribe(`ProgressSnackBarService`, () => { - let service: ProgressSnackBarService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProgressSnackBarService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/export/xlsx-export.service/xlsx-export.service.spec.ts b/client/src/app/gateways/export/xlsx-export.service/xlsx-export.service.spec.ts deleted file mode 100644 index 9efd30d670..0000000000 --- a/client/src/app/gateways/export/xlsx-export.service/xlsx-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { XlsxExportService } from './xlsx-export.service'; - -xdescribe(`XlsxExportService`, () => { - let service: XlsxExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(XlsxExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/http.service.spec.ts b/client/src/app/gateways/http.service.spec.ts deleted file mode 100644 index 0b854cf97a..0000000000 --- a/client/src/app/gateways/http.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { HttpService } from './http.service'; - -xdescribe(`HttpService`, () => { - let service: HttpService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(HttpService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/notify.service.spec.ts b/client/src/app/gateways/notify.service.spec.ts deleted file mode 100644 index 5542486d43..0000000000 --- a/client/src/app/gateways/notify.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { NotifyService } from './notify.service'; - -xdescribe(`NotifyService`, () => { - let service: NotifyService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(NotifyService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/action-worker/action-worker-repository.service.spec.ts b/client/src/app/gateways/repositories/action-worker/action-worker-repository.service.spec.ts deleted file mode 100644 index 5005742787..0000000000 --- a/client/src/app/gateways/repositories/action-worker/action-worker-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ActionWorkerRepositoryService } from './action-worker-repository.service'; - -xdescribe(`ActionWorkerRepositoryService`, () => { - let service: ActionWorkerRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ActionWorkerRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/agenda/agenda-item-repository.service.spec.ts b/client/src/app/gateways/repositories/agenda/agenda-item-repository.service.spec.ts deleted file mode 100644 index 20ae7f69ff..0000000000 --- a/client/src/app/gateways/repositories/agenda/agenda-item-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AgendaItemRepositoryService } from './agenda-item-repository.service'; - -xdescribe(`AgendaItemRepositoryService`, () => { - let service: AgendaItemRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AgendaItemRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/assignments/assignment-candidate-repository.service/assignment-candidate-repository.service.spec.ts b/client/src/app/gateways/repositories/assignments/assignment-candidate-repository.service/assignment-candidate-repository.service.spec.ts deleted file mode 100644 index f2dcf52bac..0000000000 --- a/client/src/app/gateways/repositories/assignments/assignment-candidate-repository.service/assignment-candidate-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AssignmentCandidateRepositoryService } from './assignment-candidate-repository.service'; - -xdescribe(`AssignmentCandidateRepositoryService`, () => { - let service: AssignmentCandidateRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AssignmentCandidateRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/assignments/assignment-repository.service/assignment-repository.service.spec.ts b/client/src/app/gateways/repositories/assignments/assignment-repository.service/assignment-repository.service.spec.ts deleted file mode 100644 index 0ed0c7249c..0000000000 --- a/client/src/app/gateways/repositories/assignments/assignment-repository.service/assignment-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AssignmentRepositoryService } from './assignment-repository.service'; - -xdescribe(`AssignmentRepositoryService`, () => { - let service: AssignmentRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AssignmentRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/chat/chat-group-repository.service/chat-group-repository.service.spec.ts b/client/src/app/gateways/repositories/chat/chat-group-repository.service/chat-group-repository.service.spec.ts deleted file mode 100644 index d1ea053e6f..0000000000 --- a/client/src/app/gateways/repositories/chat/chat-group-repository.service/chat-group-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ChatGroupRepositoryService } from './chat-group-repository.service'; - -xdescribe(`ChatGroupRepositoryService`, () => { - let service: ChatGroupRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ChatGroupRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/chat/chat-message-repository.service/chat-message-repository.service.spec.ts b/client/src/app/gateways/repositories/chat/chat-message-repository.service/chat-message-repository.service.spec.ts deleted file mode 100644 index e571aefffa..0000000000 --- a/client/src/app/gateways/repositories/chat/chat-message-repository.service/chat-message-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ChatMessageRepositoryService } from './chat-message-repository.service'; - -xdescribe(`ChatMessageRepositoryService`, () => { - let service: ChatMessageRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ChatMessageRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/committee-repository.service.spec.ts b/client/src/app/gateways/repositories/committee-repository.service.spec.ts deleted file mode 100644 index 2dbaa14588..0000000000 --- a/client/src/app/gateways/repositories/committee-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CommitteeRepositoryService } from './committee-repository.service'; - -xdescribe(`CommitteeRepositoryService`, () => { - let service: CommitteeRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CommitteeRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/gender/gender-repository.service.spec.ts b/client/src/app/gateways/repositories/gender/gender-repository.service.spec.ts deleted file mode 100644 index 14d24c0351..0000000000 --- a/client/src/app/gateways/repositories/gender/gender-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { GenderRepositoryService } from './gender-repository.service'; - -xdescribe(`GenderRepositoryService`, () => { - let service: GenderRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(GenderRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/groups/group-repository.service.spec.ts b/client/src/app/gateways/repositories/groups/group-repository.service.spec.ts deleted file mode 100644 index c4d3b121f0..0000000000 --- a/client/src/app/gateways/repositories/groups/group-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { GroupRepositoryService } from './group-repository.service'; - -xdescribe(`GroupRepositoryService`, () => { - let service: GroupRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(GroupRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/history-entry/history-entry-repository.service.spec.ts b/client/src/app/gateways/repositories/history-entry/history-entry-repository.service.spec.ts deleted file mode 100644 index 10e3a13d59..0000000000 --- a/client/src/app/gateways/repositories/history-entry/history-entry-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { HistoryEntryRepositoryService } from './history-entry-repository.service'; - -xdescribe(`HistoryEntryRepositoryService`, () => { - let service: HistoryEntryRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(HistoryEntryRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/history-position/history-position-repository.service.spec.ts b/client/src/app/gateways/repositories/history-position/history-position-repository.service.spec.ts deleted file mode 100644 index 86bb08c4de..0000000000 --- a/client/src/app/gateways/repositories/history-position/history-position-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { HistoryPositionRepositoryService } from './history-position-repository.service'; - -xdescribe(`HistoryPositionRepositoryService`, () => { - let service: HistoryPositionRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(HistoryPositionRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service.spec.ts b/client/src/app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service.spec.ts deleted file mode 100644 index 43da8f3905..0000000000 --- a/client/src/app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ListOfSpeakersRepositoryService } from './list-of-speakers-repository.service'; - -xdescribe(`ListOfSpeakersRepositoryService`, () => { - let service: ListOfSpeakersRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ListOfSpeakersRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/mediafiles/mediafile-repository.service.spec.ts b/client/src/app/gateways/repositories/mediafiles/mediafile-repository.service.spec.ts deleted file mode 100644 index d8a11c4901..0000000000 --- a/client/src/app/gateways/repositories/mediafiles/mediafile-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MediafileRepositoryService } from './mediafile-repository.service'; - -xdescribe(`MediafileRepositoryService`, () => { - let service: MediafileRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MediafileRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service.spec.ts b/client/src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service.spec.ts deleted file mode 100644 index ed3f6d85b7..0000000000 --- a/client/src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingMediafileRepositoryService } from './meeting-mediafile-repository.service'; - -xdescribe(`MediafileRepositoryService`, () => { - let service: MeetingMediafileRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingMediafileRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/meeting-repository.service.spec.ts b/client/src/app/gateways/repositories/meeting-repository.service.spec.ts deleted file mode 100644 index 7707203991..0000000000 --- a/client/src/app/gateways/repositories/meeting-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingRepositoryService } from './meeting-repository.service'; - -xdescribe(`MeetingRepositoryService`, () => { - let service: MeetingRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.spec.ts b/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.spec.ts deleted file mode 100644 index 545327dd9f..0000000000 --- a/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingUserRepositoryService } from './meeting-user-repository.service'; - -xdescribe(`MeetingUserRepositoryService`, () => { - let service: MeetingUserRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingUserRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/motion-block-repository.service/motion-block-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/motion-block-repository.service/motion-block-repository.service.spec.ts deleted file mode 100644 index 729dc824f6..0000000000 --- a/client/src/app/gateways/repositories/motions/motion-block-repository.service/motion-block-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionBlockRepositoryService } from './motion-block-repository.service'; - -xdescribe(`MotionBlockRepositoryService`, () => { - let service: MotionBlockRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionBlockRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/motion-category-repository.service/motion-category-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/motion-category-repository.service/motion-category-repository.service.spec.ts deleted file mode 100644 index f614879cc8..0000000000 --- a/client/src/app/gateways/repositories/motions/motion-category-repository.service/motion-category-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionCategoryRepositoryService } from './motion-category-repository.service'; - -xdescribe(`MotionCategoryRepositoryService`, () => { - let service: MotionCategoryRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionCategoryRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/motion-change-recommendation-repository.service/motion-change-recommendation-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/motion-change-recommendation-repository.service/motion-change-recommendation-repository.service.spec.ts deleted file mode 100644 index 76bc0feecd..0000000000 --- a/client/src/app/gateways/repositories/motions/motion-change-recommendation-repository.service/motion-change-recommendation-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionChangeRecommendationRepositoryService } from './motion-change-recommendation-repository.service'; - -xdescribe(`MotionChangeRecommendationRepositoryService`, () => { - let service: MotionChangeRecommendationRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionChangeRecommendationRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-repository.service.spec.ts deleted file mode 100644 index e01e62bcda..0000000000 --- a/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionCommentRepositoryService } from './motion-comment-repository.service'; - -xdescribe(`MotionCommentRepositoryService`, () => { - let service: MotionCommentRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionCommentRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-section-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-section-repository.service.spec.ts deleted file mode 100644 index d15c6db579..0000000000 --- a/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-section-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionCommentSectionRepositoryService } from './motion-comment-section-repository.service'; - -xdescribe(`MotionCommentSectionRepositoryService`, () => { - let service: MotionCommentSectionRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionCommentSectionRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/motion-editor-repository/motion-editor-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/motion-editor-repository/motion-editor-repository.service.spec.ts deleted file mode 100644 index c5e2311e57..0000000000 --- a/client/src/app/gateways/repositories/motions/motion-editor-repository/motion-editor-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionEditorRepositoryService } from './motion-editor-repository.service'; - -xdescribe(`MotionEditorRepositoryService`, () => { - let service: MotionEditorRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionEditorRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.spec.ts deleted file mode 100644 index 7ffcdf8349..0000000000 --- a/client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionRepositoryService } from './motion-repository.service'; - -xdescribe(`MotionRepositoryService`, () => { - let service: MotionRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/motion-state-repository.service/motion-state-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/motion-state-repository.service/motion-state-repository.service.spec.ts deleted file mode 100644 index 6b2982827e..0000000000 --- a/client/src/app/gateways/repositories/motions/motion-state-repository.service/motion-state-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionStateRepositoryService } from './motion-state-repository.service'; - -xdescribe(`MotionStateRepositoryService`, () => { - let service: MotionStateRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionStateRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/motion-submitter-repository.service/motion-submitter-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/motion-submitter-repository.service/motion-submitter-repository.service.spec.ts deleted file mode 100644 index 2250db0278..0000000000 --- a/client/src/app/gateways/repositories/motions/motion-submitter-repository.service/motion-submitter-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionSubmitterRepositoryService } from './motion-submitter-repository.service'; - -xdescribe(`MotionSubmitterRepositoryService`, () => { - let service: MotionSubmitterRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionSubmitterRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/motion-supporter/motion-supporter-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/motion-supporter/motion-supporter-repository.service.spec.ts deleted file mode 100644 index b3039728a1..0000000000 --- a/client/src/app/gateways/repositories/motions/motion-supporter/motion-supporter-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionSupporterRepositoryService } from './motion-supporter-repository.service'; - -xdescribe(`MotionSupporterRepositoryService`, () => { - let service: MotionSupporterRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionSupporterRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/motion-workflow-repository.service/motion-workflow-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/motion-workflow-repository.service/motion-workflow-repository.service.spec.ts deleted file mode 100644 index 8c916b126a..0000000000 --- a/client/src/app/gateways/repositories/motions/motion-workflow-repository.service/motion-workflow-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionWorkflowRepositoryService } from '.'; - -xdescribe(`MotionWorkflowRepositoryService`, () => { - let service: MotionWorkflowRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionWorkflowRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/motion-working-group-speaker-repository/motion-working-group-speaker-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/motion-working-group-speaker-repository/motion-working-group-speaker-repository.service.spec.ts deleted file mode 100644 index 2f87b3aec7..0000000000 --- a/client/src/app/gateways/repositories/motions/motion-working-group-speaker-repository/motion-working-group-speaker-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionWorkingGroupSpeakerRepositoryService } from './motion-working-group-speaker-repository.service'; - -xdescribe(`MotionWorkingGroupSpeakerRepositoryService`, () => { - let service: MotionWorkingGroupSpeakerRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionWorkingGroupSpeakerRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/motions/personal-note-repository.service/personal-note-repository.service.spec.ts b/client/src/app/gateways/repositories/motions/personal-note-repository.service/personal-note-repository.service.spec.ts deleted file mode 100644 index b1cafec533..0000000000 --- a/client/src/app/gateways/repositories/motions/personal-note-repository.service/personal-note-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PersonalNoteRepositoryService } from './personal-note-repository.service'; - -xdescribe(`PersonalNoteRepositoryService`, () => { - let service: PersonalNoteRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PersonalNoteRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/organization-repository.service.spec.ts b/client/src/app/gateways/repositories/organization-repository.service.spec.ts deleted file mode 100644 index a8d3d65a15..0000000000 --- a/client/src/app/gateways/repositories/organization-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OrganizationRepositoryService } from './organization-repository.service'; - -xdescribe(`OrganizationRepositoryService`, () => { - let service: OrganizationRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OrganizationRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/organization-tags/organization-tag-repository.service.spec.ts b/client/src/app/gateways/repositories/organization-tags/organization-tag-repository.service.spec.ts deleted file mode 100644 index 14f16606ee..0000000000 --- a/client/src/app/gateways/repositories/organization-tags/organization-tag-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OrganizationTagRepositoryService } from './organization-tag-repository.service'; - -xdescribe(`OrganizationTagRepositoryService`, () => { - let service: OrganizationTagRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OrganizationTagRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.spec.ts b/client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.spec.ts deleted file mode 100644 index 4bfe222d04..0000000000 --- a/client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PointOfOrderCategoryRepositoryService } from './point-of-order-category-repository.service'; - -xdescribe(`PointOfOrderCategoryRepositoryService`, () => { - let service: PointOfOrderCategoryRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PointOfOrderCategoryRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.spec.ts b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.spec.ts deleted file mode 100644 index a7bb0a3531..0000000000 --- a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PollCandidateListRepositoryService } from './poll-candidate-list-repository.service'; - -xdescribe(`PollCandidateListRepositoryService`, () => { - let service: PollCandidateListRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PollCandidateListRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.spec.ts b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.spec.ts deleted file mode 100644 index 1bb60dd5f1..0000000000 --- a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PollCandidateRepositoryService } from './poll-candidate-repository.service'; - -xdescribe(`PollCandidateRepositoryService`, () => { - let service: PollCandidateRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PollCandidateRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.spec.ts b/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.spec.ts deleted file mode 100644 index 089be882ce..0000000000 --- a/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OptionRepositoryService } from './option-repository.service'; - -xdescribe(`OptionRepositoryService`, () => { - let service: OptionRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OptionRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.spec.ts b/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.spec.ts deleted file mode 100644 index 988a086839..0000000000 --- a/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PollRepositoryService } from './poll-repository.service'; - -xdescribe(`PollRepositoryService`, () => { - let service: PollRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PollRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.spec.ts b/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.spec.ts deleted file mode 100644 index 4005f75387..0000000000 --- a/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { VoteRepositoryService } from './vote-repository.service'; - -xdescribe(`VoteRepositoryService`, () => { - let service: VoteRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(VoteRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/projections/projection-repository.service.spec.ts b/client/src/app/gateways/repositories/projections/projection-repository.service.spec.ts deleted file mode 100644 index eb12e2a9b8..0000000000 --- a/client/src/app/gateways/repositories/projections/projection-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectionRepositoryService } from './projection-repository.service'; - -xdescribe(`ProjectionRepositoryService`, () => { - let service: ProjectionRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectionRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service.spec.ts b/client/src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service.spec.ts deleted file mode 100644 index 53bf3c7b0e..0000000000 --- a/client/src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectorCountdownRepositoryService } from './projector-countdown-repository.service'; - -xdescribe(`ProjectorCountdownRepositoryService`, () => { - let service: ProjectorCountdownRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectorCountdownRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.spec.ts b/client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.spec.ts deleted file mode 100644 index 23b07204f2..0000000000 --- a/client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectorMessageRepositoryService } from './projector-message-repository.service'; - -xdescribe(`ProjectorMessageRepositoryService`, () => { - let service: ProjectorMessageRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectorMessageRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/projectors/projector-repository.service.spec.ts b/client/src/app/gateways/repositories/projectors/projector-repository.service.spec.ts deleted file mode 100644 index e9ef315fa8..0000000000 --- a/client/src/app/gateways/repositories/projectors/projector-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectorRepositoryService } from './projector-repository.service'; - -xdescribe(`ProjectorRepositoryService`, () => { - let service: ProjectorRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectorRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/speakers/speaker-repository.service.spec.ts b/client/src/app/gateways/repositories/speakers/speaker-repository.service.spec.ts deleted file mode 100644 index 7c6ccdb840..0000000000 --- a/client/src/app/gateways/repositories/speakers/speaker-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { SpeakerRepositoryService } from './speaker-repository.service'; - -xdescribe(`SpeakerRepositoryService`, () => { - let service: SpeakerRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(SpeakerRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers-repository.service.spec.ts b/client/src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers-repository.service.spec.ts deleted file mode 100644 index 0e4d5c4805..0000000000 --- a/client/src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { StructureLevelListOfSpeakersRepositoryService } from './structure-level-list-of-speakers-repository.service'; - -xdescribe(`StructureLevelListOfSpeakersRepositoryService`, () => { - let service: StructureLevelListOfSpeakersRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(StructureLevelListOfSpeakersRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.spec.ts b/client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.spec.ts deleted file mode 100644 index 2e1215a421..0000000000 --- a/client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { StructureLevelRepositoryService } from './structure-level-repository.service'; - -xdescribe(`StructureLevelRepositoryService`, () => { - let service: StructureLevelRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(StructureLevelRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/tags/tag-repository.service.spec.ts b/client/src/app/gateways/repositories/tags/tag-repository.service.spec.ts deleted file mode 100644 index f00c592796..0000000000 --- a/client/src/app/gateways/repositories/tags/tag-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { TagRepositoryService } from './tag-repository.service'; - -xdescribe(`TagRepositoryService`, () => { - let service: TagRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(TagRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/themes/theme-repository.service.spec.ts b/client/src/app/gateways/repositories/themes/theme-repository.service.spec.ts deleted file mode 100644 index a8334f1a93..0000000000 --- a/client/src/app/gateways/repositories/themes/theme-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ThemeRepositoryService } from './theme-repository.service'; - -xdescribe(`ThemeRepositoryService`, () => { - let service: ThemeRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ThemeRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/topics/topic-repository.service.spec.ts b/client/src/app/gateways/repositories/topics/topic-repository.service.spec.ts deleted file mode 100644 index 56e7046dd1..0000000000 --- a/client/src/app/gateways/repositories/topics/topic-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { TopicRepositoryService } from './topic-repository.service'; - -xdescribe(`TopicRepositoryService`, () => { - let service: TopicRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(TopicRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/gateways/repositories/users/user-repository.service.spec.ts b/client/src/app/gateways/repositories/users/user-repository.service.spec.ts deleted file mode 100644 index 0b3371810c..0000000000 --- a/client/src/app/gateways/repositories/users/user-repository.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { UserRepositoryService } from './user-repository.service'; - -xdescribe(`UserRepositoryService`, () => { - let service: UserRepositoryService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(UserRepositoryService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.spec.ts b/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.spec.ts deleted file mode 100644 index 085050987d..0000000000 --- a/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AuthTokenInterceptor } from './auth-token.interceptor'; - -xdescribe(`AuthTokenInterceptor`, () => { - beforeEach(() => - TestBed.configureTestingModule({ - providers: [AuthTokenInterceptor] - }) - ); - - it(`should be created`, () => { - const interceptor: AuthTokenInterceptor = TestBed.inject(AuthTokenInterceptor); - expect(interceptor).toBeTruthy(); - }); -}); diff --git a/client/src/app/openslides-main-module/services/app-load.service.spec.ts b/client/src/app/openslides-main-module/services/app-load.service.spec.ts deleted file mode 100644 index 9eed63e491..0000000000 --- a/client/src/app/openslides-main-module/services/app-load.service.spec.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { E2EImportsModule } from 'src/e2e-imports.module'; - -import { AppLoadService } from './app-load.service'; - -xdescribe(`AppLoadService`, () => { - let service: AppLoadService; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [E2EImportsModule] - }); - service = TestBed.inject(AppLoadService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/openslides-main-module/services/dom.service.spec.ts b/client/src/app/openslides-main-module/services/dom.service.spec.ts deleted file mode 100644 index 4a648e8cb0..0000000000 --- a/client/src/app/openslides-main-module/services/dom.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { DomService } from './dom.service'; - -xdescribe(`DomService`, () => { - let service: DomService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(DomService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/guards/auth.guard.spec.ts b/client/src/app/site/guards/auth.guard.spec.ts deleted file mode 100644 index 524b8f46ff..0000000000 --- a/client/src/app/site/guards/auth.guard.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AuthGuard } from './auth.guard'; - -xdescribe(`AuthGuard`, () => { - let guard: AuthGuard; - - beforeEach(() => { - TestBed.configureTestingModule({}); - guard = TestBed.inject(AuthGuard); - }); - - it(`should be created`, () => { - expect(guard).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/guards/permission.guard.spec.ts b/client/src/app/site/guards/permission.guard.spec.ts deleted file mode 100644 index 62ecff02a3..0000000000 --- a/client/src/app/site/guards/permission.guard.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PermissionGuard } from './permission.guard'; - -xdescribe(`PermissionGuard`, () => { - let guard: PermissionGuard; - - beforeEach(() => { - TestBed.configureTestingModule({}); - guard = TestBed.inject(PermissionGuard); - }); - - it(`should be created`, () => { - expect(guard).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/guards/watch-for-changes.guard.spec.ts b/client/src/app/site/guards/watch-for-changes.guard.spec.ts deleted file mode 100644 index 727d832c3e..0000000000 --- a/client/src/app/site/guards/watch-for-changes.guard.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { WatchForChangesGuard } from './watch-for-changes.guard'; - -xdescribe(`WatchForChangesGuard`, () => { - let guard: WatchForChangesGuard; - - beforeEach(() => { - TestBed.configureTestingModule({}); - guard = TestBed.inject(WatchForChangesGuard); - }); - - it(`should be created`, () => { - expect(guard).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/modules/global-spinner/services/spinner.service.spec.ts b/client/src/app/site/modules/global-spinner/services/spinner.service.spec.ts deleted file mode 100644 index 62b231e7bc..0000000000 --- a/client/src/app/site/modules/global-spinner/services/spinner.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { SpinnerService } from './spinner.service'; - -xdescribe(`SpinnerService`, () => { - let service: SpinnerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(SpinnerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/modules/site-wrapper/services/banner.service.spec.ts b/client/src/app/site/modules/site-wrapper/services/banner.service.spec.ts deleted file mode 100644 index 05e744c947..0000000000 --- a/client/src/app/site/modules/site-wrapper/services/banner.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { BannerService } from './banner.service'; - -xdescribe(`BannerService`, () => { - let service: BannerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(BannerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/modules/site-wrapper/services/update.service.spec.ts b/client/src/app/site/modules/site-wrapper/services/update.service.spec.ts deleted file mode 100644 index ab52bf8af4..0000000000 --- a/client/src/app/site/modules/site-wrapper/services/update.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { UpdateService } from './update.service'; - -xdescribe(`UpdateService`, () => { - let service: UpdateService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(UpdateService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/modules/site-wrapper/services/voting-banner.service.spec.ts b/client/src/app/site/modules/site-wrapper/services/voting-banner.service.spec.ts deleted file mode 100644 index b24fcf124b..0000000000 --- a/client/src/app/site/modules/site-wrapper/services/voting-banner.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { VotingBannerService } from './voting-banner.service'; - -xdescribe(`VotingBannerService`, () => { - let service: VotingBannerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(VotingBannerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/modules/user-components/services/user-delete-dialog.service.spec.ts b/client/src/app/site/modules/user-components/services/user-delete-dialog.service.spec.ts deleted file mode 100644 index 07c2e2e3e6..0000000000 --- a/client/src/app/site/modules/user-components/services/user-delete-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { UserDeleteDialogService } from './user-delete-dialog.service'; - -xdescribe(`UserDeleteDialogService`, () => { - let service: UserDeleteDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(UserDeleteDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service.spec.ts b/client/src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service.spec.ts deleted file mode 100644 index a5fafcb19a..0000000000 --- a/client/src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { WaitForActionDialogService } from './wait-for-action-dialog.service'; - -xdescribe(`WaitForActionDialogService`, () => { - let service: WaitForActionDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(WaitForActionDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/login/services/browser-support.service.spec.ts b/client/src/app/site/pages/login/services/browser-support.service.spec.ts deleted file mode 100644 index 434efb9195..0000000000 --- a/client/src/app/site/pages/login/services/browser-support.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { BrowserSupportService } from './browser-support.service'; - -xdescribe(`BrowserSupportService`, () => { - let service: BrowserSupportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(BrowserSupportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/services/point-of-order-dialog.service.spec.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/services/point-of-order-dialog.service.spec.ts deleted file mode 100644 index 34678499ff..0000000000 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/services/point-of-order-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PointOfOrderDialogService } from './point-of-order-dialog.service'; - -xdescribe(`PointOfOrderDialogService`, () => { - let service: PointOfOrderDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PointOfOrderDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/services/speaker-user-select-dialog.service.spec.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/services/speaker-user-select-dialog.service.spec.ts deleted file mode 100644 index c40e295e37..0000000000 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/services/speaker-user-select-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { SpeakerUserSelectDialogService } from './speaker-user-select-dialog.service'; - -xdescribe(`SpeakerUserSelectDialogService`, () => { - let service: SpeakerUserSelectDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(SpeakerUserSelectDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/services/agenda-content-object-form.service.spec.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/services/agenda-content-object-form.service.spec.ts deleted file mode 100644 index 74f3987dfd..0000000000 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/services/agenda-content-object-form.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AgendaContentObjectFormService } from './agenda-content-object-form.service'; - -xdescribe(`AgendaContentObjectFormService`, () => { - let service: AgendaContentObjectFormService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AgendaContentObjectFormService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/services/projectable-list.service.spec.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/services/projectable-list.service.spec.ts deleted file mode 100644 index d1461a5906..0000000000 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/services/projectable-list.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectableListService } from './projectable-list.service'; - -xdescribe(`ProjectableListService`, () => { - let service: ProjectableListService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectableListService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.spec.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.spec.ts deleted file mode 100644 index 2baa1933b2..0000000000 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectionDialogService } from './projection-dialog.service'; - -xdescribe(`ProjectionDialogService`, () => { - let service: ProjectionDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectionDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.spec.ts b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.spec.ts deleted file mode 100644 index 98c92412bd..0000000000 --- a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { VotingPrivacyWarningDialogService } from './voting-privacy-warning-dialog.service'; - -xdescribe(`VotingPrivacyWarningDialogService`, () => { - let service: VotingPrivacyWarningDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(VotingPrivacyWarningDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.spec.ts b/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.spec.ts deleted file mode 100644 index 1cc47cd47a..0000000000 --- a/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PollControllerService } from './poll-controller.service'; - -xdescribe(`PollControllerService`, () => { - let service: PollControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PollControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/modules/poll/services/poll-dialog.service/poll-dialog.service.spec.ts b/client/src/app/site/pages/meetings/modules/poll/services/poll-dialog.service/poll-dialog.service.spec.ts deleted file mode 100644 index 61219a00de..0000000000 --- a/client/src/app/site/pages/meetings/modules/poll/services/poll-dialog.service/poll-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PollDialogService } from './poll-dialog.service'; - -xdescribe(`PollDialogService`, () => { - let service: PollDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PollDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/modules/poll/services/poll-service-mapper.service/poll-service-mapper.service.spec.ts b/client/src/app/site/pages/meetings/modules/poll/services/poll-service-mapper.service/poll-service-mapper.service.spec.ts deleted file mode 100644 index fcf6443f80..0000000000 --- a/client/src/app/site/pages/meetings/modules/poll/services/poll-service-mapper.service/poll-service-mapper.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PollServiceMapperService } from './poll-service-mapper.service'; - -xdescribe(`PollServiceMapperService`, () => { - let service: PollServiceMapperService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PollServiceMapperService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.spec.ts b/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.spec.ts deleted file mode 100644 index e384c037d8..0000000000 --- a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { VoteControllerService } from './vote-controller.service'; - -xdescribe(`VoteControllerService`, () => { - let service: VoteControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(VoteControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.spec.ts b/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.spec.ts deleted file mode 100644 index 4399668551..0000000000 --- a/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { VotingService } from './voting.service'; - -xdescribe(`VotingService`, () => { - let service: VotingService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(VotingService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service.spec.ts deleted file mode 100644 index 7641b5189d..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CurrentListOfSpeakersSlideService } from './current-list-of-speakers-slide.service'; - -xdescribe(`CurrentListOfSpeakersSlideService`, () => { - let service: CurrentListOfSpeakersSlideService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CurrentListOfSpeakersSlideService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers.service.spec.ts deleted file mode 100644 index 449d35e478..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CurrentListOfSpeakersService } from './current-list-of-speakers.service'; - -xdescribe(`CurrentListOfSpeakersService`, () => { - let service: CurrentListOfSpeakersService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CurrentListOfSpeakersService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service.spec.ts deleted file mode 100644 index ef209938df..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ListOfSpeakersControllerService } from './list-of-speakers-controller.service'; - -xdescribe(`ListOfSpeakersControllerService`, () => { - let service: ListOfSpeakersControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ListOfSpeakersControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/point-of-order-category-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/point-of-order-category-controller.service.spec.ts deleted file mode 100644 index 7d7c13d9a8..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/point-of-order-category-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PointOfOrderCategoryControllerService } from './point-of-order-category-controller.service'; - -xdescribe(`PointOfOrderCategoryControllerService`, () => { - let service: PointOfOrderCategoryControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PointOfOrderCategoryControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service.spec.ts deleted file mode 100644 index 8d87d6f1b0..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { SpeakerControllerService } from './speaker-controller.service'; - -xdescribe(`SpeakerControllerService`, () => { - let service: SpeakerControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(SpeakerControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-dialog.service.spec.ts deleted file mode 100644 index bef874679e..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { TopicPollDialogService } from './topic-poll-dialog.service'; - -xdescribe(`TopicPollDialogService`, () => { - let service: TopicPollDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(TopicPollDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.spec.ts deleted file mode 100644 index eb9fcdc1ce..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { TopicPollService } from './topic-poll.service'; - -xdescribe(`TopicPollService`, () => { - let service: TopicPollService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(TopicPollService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-export.service/topic-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-export.service/topic-export.service.spec.ts deleted file mode 100644 index 83b8da7845..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-export.service/topic-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { TopicExportService } from './topic-export.service'; - -xdescribe(`TopicExportService`, () => { - let service: TopicExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(TopicExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-import.service/topic-import.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-import.service/topic-import.service.spec.ts deleted file mode 100644 index 321c19aa54..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-import.service/topic-import.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { TopicImportService } from './topic-import.service'; - -xdescribe(`TopicImportService`, () => { - let service: TopicImportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(TopicImportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-controller.service/topic-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-controller.service/topic-controller.service.spec.ts deleted file mode 100644 index eb833ee771..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-controller.service/topic-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { TopicControllerService } from './topic-controller.service'; - -xdescribe(`TopicControllerService`, () => { - let service: TopicControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(TopicControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-export.service/agenda-item-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-export.service/agenda-item-export.service.spec.ts deleted file mode 100644 index 013f9b719f..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-export.service/agenda-item-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AgendaItemExportService } from './agenda-item-export.service'; - -xdescribe(`AgendaItemExportService`, () => { - let service: AgendaItemExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AgendaItemExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-filter.service/agenda-item-filter.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-filter.service/agenda-item-filter.service.spec.ts deleted file mode 100644 index c64d5b8aaa..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-filter.service/agenda-item-filter.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AgendaItemFilterService } from './agenda-item-filter.service'; - -xdescribe(`AgendaItemFilterService`, () => { - let service: AgendaItemFilterService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AgendaItemFilterService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-multiselect.service/agenda-item-multiselect.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-multiselect.service/agenda-item-multiselect.service.spec.ts deleted file mode 100644 index 1239e47cd3..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-multiselect.service/agenda-item-multiselect.service.spec.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { TestBed } from '@angular/core/testing'; -import { E2EImportsModule } from 'src/e2e-imports.module'; - -import { AgendaItemListModule } from '../../agenda-item-list.module'; -import { AgendaItemMultiselectService } from './agenda-item-multiselect.service'; - -xdescribe(`AgendaItemMultiselectService`, () => { - let service: AgendaItemMultiselectService; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [E2EImportsModule, AgendaItemListModule] - }); - service = TestBed.inject(AgendaItemMultiselectService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/services/agenda-item-controller.service/agenda-item-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/services/agenda-item-controller.service/agenda-item-controller.service.spec.ts deleted file mode 100644 index 7f4bf9c97a..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/services/agenda-item-controller.service/agenda-item-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AgendaItemControllerService } from './agenda-item-controller.service'; - -xdescribe(`AgendaItemControllerService`, () => { - let service: AgendaItemControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AgendaItemControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.spec.ts deleted file mode 100644 index 9d0d5e2455..0000000000 --- a/client/src/app/site/pages/meetings/pages/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AgendaPdfCatalogExportService } from './agenda-pdf-catalog-export.service'; - -xdescribe('AgendaPdfCatalogExportService', () => { - let service: AgendaPdfCatalogExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AgendaPdfCatalogExportService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-dialog.service.spec.ts deleted file mode 100644 index de31fcfd23..0000000000 --- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AssignmentPollDialogService } from './assignment-poll-dialog.service'; - -xdescribe(`AssignmentPollDialogService`, () => { - let service: AssignmentPollDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AssignmentPollDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-pdf.service/assignment-poll-pdf.service.spec.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-pdf.service/assignment-poll-pdf.service.spec.ts deleted file mode 100644 index e233aaf928..0000000000 --- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-pdf.service/assignment-poll-pdf.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AssignmentPollPdfService } from './assignment-poll-pdf.service'; - -xdescribe(`AssignmentPollPdfService`, () => { - let service: AssignmentPollPdfService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AssignmentPollPdfService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.spec.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.spec.ts deleted file mode 100644 index 89e466a582..0000000000 --- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AssignmentPollService } from './assignment-poll.service'; - -xdescribe(`AssignmentPollService`, () => { - let service: AssignmentPollService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AssignmentPollService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/services/assignment-candidate-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/services/assignment-candidate-controller.service.spec.ts deleted file mode 100644 index 438423501a..0000000000 --- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/services/assignment-candidate-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AssignmentCandidateControllerService } from './assignment-candidate-controller.service'; - -xdescribe(`AssignmentCandidateControllerService`, () => { - let service: AssignmentCandidateControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AssignmentCandidateControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-filter-list.service.spec.ts b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-filter-list.service.spec.ts deleted file mode 100644 index f91a37d323..0000000000 --- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-filter-list.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AssignmentFilterListService } from './assignment-filter-list.service'; - -xdescribe(`AssignmentFilterListService`, () => { - let service: AssignmentFilterListService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AssignmentFilterListService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-sort-list.service.spec.ts b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-sort-list.service.spec.ts deleted file mode 100644 index 67c86e620e..0000000000 --- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-sort-list.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AssignmentSortListService } from './assignment-sort-list.service'; - -xdescribe(`AssignmentSortListService`, () => { - let service: AssignmentSortListService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AssignmentSortListService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/assignments/services/assignment-controller.service.spec.ts deleted file mode 100644 index 1d67f73227..0000000000 --- a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AssignmentControllerService } from './assignment-controller.service'; - -xdescribe(`AssignmentControllerService`, () => { - let service: AssignmentControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AssignmentControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/assignments/services/assignment-export.service.spec.ts deleted file mode 100644 index e577218315..0000000000 --- a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AssignmentExportService } from './assignment-export.service'; - -xdescribe(`AssignmentExportService`, () => { - let service: AssignmentExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AssignmentExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-pdf.service.spec.ts b/client/src/app/site/pages/meetings/pages/assignments/services/assignment-pdf.service.spec.ts deleted file mode 100644 index 9097956b0c..0000000000 --- a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-pdf.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AssignmentPdfService } from './assignment-pdf.service'; - -xdescribe(`AssignmentPdfService`, () => { - let service: AssignmentPdfService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AssignmentPdfService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/services/chat-group-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/services/chat-group-dialog.service.spec.ts deleted file mode 100644 index 8c42b75ea7..0000000000 --- a/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/services/chat-group-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ChatGroupDialogService } from './chat-group-dialog.service'; - -xdescribe(`ChatGroupDialogService`, () => { - let service: ChatGroupDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ChatGroupDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/chat/services/chat-group-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/chat/services/chat-group-controller.service.spec.ts deleted file mode 100644 index d881f51a06..0000000000 --- a/client/src/app/site/pages/meetings/pages/chat/services/chat-group-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ChatGroupControllerService } from './chat-group-controller.service'; - -xdescribe(`ChatGroupControllerService`, () => { - let service: ChatGroupControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ChatGroupControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/chat/services/chat-message-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/chat/services/chat-message-controller.service.spec.ts deleted file mode 100644 index dc5dbdaa5a..0000000000 --- a/client/src/app/site/pages/meetings/pages/chat/services/chat-message-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ChatMessageControllerService } from './chat-message-controller.service'; - -xdescribe(`ChatMessageControllerService`, () => { - let service: ChatMessageControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ChatMessageControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/chat/services/chat-notification.service.spec.ts b/client/src/app/site/pages/meetings/pages/chat/services/chat-notification.service.spec.ts deleted file mode 100644 index 9d545e7d8b..0000000000 --- a/client/src/app/site/pages/meetings/pages/chat/services/chat-notification.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ChatNotificationService } from './chat-notification.service'; - -xdescribe(`ChatNotificationService`, () => { - let service: ChatNotificationService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ChatNotificationService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/chat/services/chat.service.spec.ts b/client/src/app/site/pages/meetings/pages/chat/services/chat.service.spec.ts deleted file mode 100644 index 1d17d0a07b..0000000000 --- a/client/src/app/site/pages/meetings/pages/chat/services/chat.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ChatService } from './chat.service'; - -xdescribe(`ChatService`, () => { - let service: ChatService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ChatService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/home/pages/meeting-info/services/count-users-statistics.service.spec.ts b/client/src/app/site/pages/meetings/pages/home/pages/meeting-info/services/count-users-statistics.service.spec.ts deleted file mode 100644 index 7c70bae1c3..0000000000 --- a/client/src/app/site/pages/meetings/pages/home/pages/meeting-info/services/count-users-statistics.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CountUsersStatisticsService } from './count-users-statistics.service'; - -xdescribe(`CountUsersStatisticsService`, () => { - let service: CountUsersStatisticsService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CountUsersStatisticsService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/applause.service.spec.ts b/client/src/app/site/pages/meetings/pages/interaction/services/applause.service.spec.ts deleted file mode 100644 index a4c6dd2fb3..0000000000 --- a/client/src/app/site/pages/meetings/pages/interaction/services/applause.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ApplauseService } from './applause.service'; - -xdescribe(`ApplauseService`, () => { - let service: ApplauseService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ApplauseService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/broadcast.service.spec.ts b/client/src/app/site/pages/meetings/pages/interaction/services/broadcast.service.spec.ts deleted file mode 100644 index 6cb183f2d6..0000000000 --- a/client/src/app/site/pages/meetings/pages/interaction/services/broadcast.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { BroadcastService } from './broadcast.service'; - -xdescribe(`BroadcastService`, () => { - let service: BroadcastService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(BroadcastService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/call-restriction.service.spec.ts b/client/src/app/site/pages/meetings/pages/interaction/services/call-restriction.service.spec.ts deleted file mode 100644 index 3293b0dd1a..0000000000 --- a/client/src/app/site/pages/meetings/pages/interaction/services/call-restriction.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CallRestrictionService } from './call-restriction.service'; - -xdescribe(`CallRestrictionService`, () => { - let service: CallRestrictionService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CallRestrictionService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/interaction-receive.service.spec.ts b/client/src/app/site/pages/meetings/pages/interaction/services/interaction-receive.service.spec.ts deleted file mode 100644 index 468f527a36..0000000000 --- a/client/src/app/site/pages/meetings/pages/interaction/services/interaction-receive.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { InteractionReceiveService } from './interaction-receive.service'; - -xdescribe(`InteractionReceiveService`, () => { - let service: InteractionReceiveService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(InteractionReceiveService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/interaction.service.spec.ts b/client/src/app/site/pages/meetings/pages/interaction/services/interaction.service.spec.ts deleted file mode 100644 index 72a507e07d..0000000000 --- a/client/src/app/site/pages/meetings/pages/interaction/services/interaction.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { InteractionService } from './interaction.service'; - -xdescribe(`InteractionService`, () => { - let service: InteractionService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(InteractionService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/operator-media-permission.service.spec.ts b/client/src/app/site/pages/meetings/pages/interaction/services/operator-media-permission.service.spec.ts deleted file mode 100644 index 6cf7cb0410..0000000000 --- a/client/src/app/site/pages/meetings/pages/interaction/services/operator-media-permission.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OperatorMediaPermissionService } from './operator-media-permission.service'; - -xdescribe(`OperatorMediaPermissionService`, () => { - let service: OperatorMediaPermissionService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OperatorMediaPermissionService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/rtc.service.spec.ts b/client/src/app/site/pages/meetings/pages/interaction/services/rtc.service.spec.ts deleted file mode 100644 index beb733194f..0000000000 --- a/client/src/app/site/pages/meetings/pages/interaction/services/rtc.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { RtcService } from './rtc.service'; - -xdescribe(`RtcService`, () => { - let service: RtcService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(RtcService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/stream.service.spec.ts b/client/src/app/site/pages/meetings/pages/interaction/services/stream.service.spec.ts deleted file mode 100644 index 54bf6c40e8..0000000000 --- a/client/src/app/site/pages/meetings/pages/interaction/services/stream.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { StreamService } from './stream.service'; - -xdescribe(`StreamService`, () => { - let service: StreamService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(StreamService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service.spec.ts deleted file mode 100644 index 79b6dc42d1..0000000000 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MediafileListExportService } from './mediafile-list-export.service'; - -xdescribe(`MediafileListExportService`, () => { - let service: MediafileListExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MediafileListExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-group.service/mediafile-list-group.service.spec.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-group.service/mediafile-list-group.service.spec.ts deleted file mode 100644 index 41cb02ecb0..0000000000 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-group.service/mediafile-list-group.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MediafileListGroupService } from './mediafile-list-group.service'; - -xdescribe(`MediafileListGroupService`, () => { - let service: MediafileListGroupService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MediafileListGroupService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service.spec.ts b/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service.spec.ts deleted file mode 100644 index e7f0a17ff5..0000000000 --- a/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MediafileCommonService } from './mediafile-common.service'; - -xdescribe(`MediafileCommonService`, () => { - let service: MediafileCommonService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MediafileCommonService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service.spec.ts deleted file mode 100644 index 57335c6ff1..0000000000 --- a/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MediafileControllerService } from './mediafile-controller.service'; - -xdescribe(`MediafileControllerService`, () => { - let service: MediafileControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MediafileControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/services/motion-forward-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/services/motion-forward-dialog.service.spec.ts deleted file mode 100644 index ebe7d086c1..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/services/motion-forward-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionForwardDialogService } from './motion-forward-dialog.service'; - -xdescribe(`MotionForwardDialogService`, () => { - let service: MotionForwardDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionForwardDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect.service.spec.ts deleted file mode 100644 index 3ddc39d514..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionMultiselectService } from './motion-multiselect.service'; - -xdescribe(`MotionMultiselectService`, () => { - let service: MotionMultiselectService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionMultiselectService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/categories/services/motion-category-controller.service/motion-category-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/categories/services/motion-category-controller.service/motion-category-controller.service.spec.ts deleted file mode 100644 index f8ad94bef7..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/categories/services/motion-category-controller.service/motion-category-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionCategoryControllerService } from './motion-category-controller.service'; - -xdescribe(`MotionCategoryControllerService`, () => { - let service: MotionCategoryControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionCategoryControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service.spec.ts deleted file mode 100644 index 57b18d988e..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionChangeRecommendationControllerService } from './motion-change-recommendation-controller.service'; - -xdescribe(`MotionChangeRecommendationControllerService`, () => { - let service: MotionChangeRecommendationControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionChangeRecommendationControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-controller.service.spec.ts deleted file mode 100644 index a07f26ac3f..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionCommentControllerService } from './motion-comment-controller.service'; - -xdescribe(`MotionCommentControllerService`, () => { - let service: MotionCommentControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionCommentControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-section-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-section-controller.service.spec.ts deleted file mode 100644 index 892d527876..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-section-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionCommentSectionControllerService } from './motion-comment-section-controller.service'; - -xdescribe(`MotionCommentSectionControllerService`, () => { - let service: MotionCommentSectionControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionCommentSectionControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/editors/services/motion-editor-controller/motion-editor-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/editors/services/motion-editor-controller/motion-editor-controller.service.spec.ts deleted file mode 100644 index 0dec2ac3c9..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/editors/services/motion-editor-controller/motion-editor-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionEditorControllerService } from './motion-editor-controller.service'; - -xdescribe(`MotionEditorControllerService`, () => { - let service: MotionEditorControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionEditorControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/services/motion-block-controller.service/motion-block-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/services/motion-block-controller.service/motion-block-controller.service.spec.ts deleted file mode 100644 index af423e1e80..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/services/motion-block-controller.service/motion-block-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionBlockControllerService } from './motion-block-controller.service'; - -xdescribe(`MotionBlockControllerService`, () => { - let service: MotionBlockControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionBlockControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.spec.ts deleted file mode 100644 index 7a1287df8f..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionPollControllerService } from './motion-poll-controller.service'; - -xdescribe(`MotionPollControllerService`, () => { - let service: MotionPollControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionPollControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-dialog.service/motion-poll-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-dialog.service/motion-poll-dialog.service.spec.ts deleted file mode 100644 index 5bbdbd9f98..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-dialog.service/motion-poll-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionPollDialogService } from './motion-poll-dialog.service'; - -xdescribe(`MotionPollDialogService`, () => { - let service: MotionPollDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionPollDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-pdf.service/motion-poll-pdf.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-pdf.service/motion-poll-pdf.service.spec.ts deleted file mode 100644 index d8706663fd..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-pdf.service/motion-poll-pdf.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionPollPdfService } from './motion-poll-pdf.service'; - -xdescribe(`MotionPollPdfService`, () => { - let service: MotionPollPdfService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionPollPdfService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.spec.ts deleted file mode 100644 index 2680838453..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionPollService } from './motion-poll.service'; - -xdescribe(`MotionPollService`, () => { - let service: MotionPollService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionPollService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service.spec.ts deleted file mode 100644 index d781f425d2..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PersonalNoteControllerService } from './personal-note-controller.service'; - -xdescribe(`PersonalNoteControllerService`, () => { - let service: PersonalNoteControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PersonalNoteControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/states/services/motion-state-controller.service/motion-state-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/states/services/motion-state-controller.service/motion-state-controller.service.spec.ts deleted file mode 100644 index ac2fe53a84..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/states/services/motion-state-controller.service/motion-state-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionStateControllerService } from './motion-state-controller.service'; - -xdescribe(`MotionStateControllerService`, () => { - let service: MotionStateControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionStateControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/submitters/services/motion-submitter-controller/motion-submitter-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/submitters/services/motion-submitter-controller/motion-submitter-controller.service.spec.ts deleted file mode 100644 index f2c889e03f..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/submitters/services/motion-submitter-controller/motion-submitter-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionSubmitterControllerService } from './motion-submitter-controller.service'; - -xdescribe(`MotionSubmitterControllerService`, () => { - let service: MotionSubmitterControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionSubmitterControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/supporters/services/motion-supporter-controller/motion-supporter-controller.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/supporters/services/motion-supporter-controller/motion-supporter-controller.spec.ts deleted file mode 100644 index 3d398dc919..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/supporters/services/motion-supporter-controller/motion-supporter-controller.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionSupporterControllerService } from './motion-supporter-controller.service'; - -xdescribe(`MotionSupporterControllerService`, () => { - let service: MotionSupporterControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionSupporterControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/tags/services/tag-controller.service/tag-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/tags/services/tag-controller.service/tag-controller.service.spec.ts deleted file mode 100644 index 8ad486dd96..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/tags/services/tag-controller.service/tag-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { TagControllerService } from './tag-controller.service'; - -xdescribe(`TagControllerService`, () => { - let service: TagControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(TagControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/workflows/services/motion-workflow-controller.service/motion-workflow-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/workflows/services/motion-workflow-controller.service/motion-workflow-controller.service.spec.ts deleted file mode 100644 index 8f4776b93e..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/workflows/services/motion-workflow-controller.service/motion-workflow-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionWorkflowControllerService } from './motion-workflow-controller.service'; - -xdescribe(`MotionWorkflowControllerService`, () => { - let service: MotionWorkflowControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionWorkflowControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/services/motion-working-group-speaker-controller/motion-working-group-speaker-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/services/motion-working-group-speaker-controller/motion-working-group-speaker-controller.service.spec.ts deleted file mode 100644 index e9d411813c..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/services/motion-working-group-speaker-controller/motion-working-group-speaker-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionWorkingGroupSpeakerControllerService } from './motion-working-group-speaker-controller.service'; - -xdescribe(`MotionWorkingGroupSpeakerControllerService`, () => { - let service: MotionWorkingGroupSpeakerControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionWorkingGroupSpeakerControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/services/motion-block-create-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/services/motion-block-create-dialog.service.spec.ts deleted file mode 100644 index 05d7d29495..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/services/motion-block-create-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionBlockCreateDialogService } from './motion-block-create-dialog.service'; - -xdescribe(`MotionBlockCreateDialogService`, () => { - let service: MotionBlockCreateDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionBlockCreateDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/services/motion-block-edit-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/services/motion-block-edit-dialog.service.spec.ts deleted file mode 100644 index bcb961c8f6..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/services/motion-block-edit-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionBlockEditDialogService } from './motion-block-edit-dialog.service'; - -xdescribe(`MotionBlockEditDialogService`, () => { - let service: MotionBlockEditDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionBlockEditDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-detail-filter-list.service/motion-block-detail-filter-list.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-detail-filter-list.service/motion-block-detail-filter-list.service.spec.ts deleted file mode 100644 index d4fe4b6030..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-detail-filter-list.service/motion-block-detail-filter-list.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionBlockDetailFilterListService } from './motion-block-detail-filter-list.service'; - -xdescribe(`MotionBlockDetailFilterListService`, () => { - let service: MotionBlockDetailFilterListService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionBlockDetailFilterListService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-sort.service/motion-block-sort.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-sort.service/motion-block-sort.service.spec.ts deleted file mode 100644 index dfd8aeabbc..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-sort.service/motion-block-sort.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionBlockSortService } from './motion-block-sort.service'; - -xdescribe(`MotionBlockSortService`, () => { - let service: MotionBlockSortService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionBlockSortService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/services/motion-change-recommendation-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/services/motion-change-recommendation-dialog.service.spec.ts deleted file mode 100644 index 0d4673aa81..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/services/motion-change-recommendation-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionChangeRecommendationDialogService } from './motion-change-recommendation-dialog.service'; - -xdescribe(`MotionChangeRecommendationDialogService`, () => { - let service: MotionChangeRecommendationDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionChangeRecommendationDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/services/motion-detail-view.service/motion-detail-view.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/services/motion-detail-view.service/motion-detail-view.service.spec.ts deleted file mode 100644 index e97375507b..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/services/motion-detail-view.service/motion-detail-view.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionDetailViewService } from './motion-detail-view.service'; - -xdescribe(`MotionDetailViewService`, () => { - let service: MotionDetailViewService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionDetailViewService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/services/motion-list-info-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/services/motion-list-info-dialog.service.spec.ts deleted file mode 100644 index 449c141767..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/services/motion-list-info-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionListInfoDialogService } from './motion-list-info-dialog.service'; - -xdescribe(`MotionListInfoDialogService`, () => { - let service: MotionListInfoDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionListInfoDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/services/workflow-export.service/workflow-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/services/workflow-export.service/workflow-export.service.spec.ts deleted file mode 100644 index 6c235de07d..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/services/workflow-export.service/workflow-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { WorkflowExportService } from './workflow-export.service'; - -xdescribe(`WorkflowExportService`, () => { - let service: WorkflowExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(WorkflowExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.spec.ts deleted file mode 100644 index 8a4e70cd44..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AmendmentControllerService } from './amendment-controller.service'; - -xdescribe(`AmendmentControllerService`, () => { - let service: AmendmentControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AmendmentControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-controller.service/motion-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-controller.service/motion-controller.service.spec.ts deleted file mode 100644 index 1c15f649b5..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-controller.service/motion-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionControllerService } from './motion-controller.service'; - -xdescribe(`MotionControllerService`, () => { - let service: MotionControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-format.service/motion-format.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-format.service/motion-format.service.spec.ts deleted file mode 100644 index b050865f8b..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-format.service/motion-format.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionFormatService } from './motion-format.service'; - -xdescribe(`MotionFormatService`, () => { - let service: MotionFormatService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionFormatService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-line-numbering.service/motion-line-numbering.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-line-numbering.service/motion-line-numbering.service.spec.ts deleted file mode 100644 index 10a279d044..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-line-numbering.service/motion-line-numbering.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionLineNumberingService } from './motion-line-numbering.service'; - -xdescribe(`MotionLineNumberingService`, () => { - let service: MotionLineNumberingService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionLineNumberingService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.spec.ts deleted file mode 100644 index 2654e86bb3..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionPermissionService } from './motion-permission.service'; - -xdescribe(`MotionPermissionService`, () => { - let service: MotionPermissionService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionPermissionService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/amendment-list-pdf.service/amendment-list-pdf.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/amendment-list-pdf.service/amendment-list-pdf.service.spec.ts deleted file mode 100644 index 8e7ac9db58..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/amendment-list-pdf.service/amendment-list-pdf.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AmendmentListPdfService } from './amendment-list-pdf.service'; - -xdescribe(`AmendmentListPdfService`, () => { - let service: AmendmentListPdfService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AmendmentListPdfService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.spec.ts deleted file mode 100644 index 5bb021d93f..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionCsvExportService } from './motion-csv-export.service'; - -xdescribe(`MotionCsvExportService`, () => { - let service: MotionCsvExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionCsvExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-export.service/motion-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-export.service/motion-export.service.spec.ts deleted file mode 100644 index 6a566a6ab1..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-export.service/motion-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionExportService } from './motion-export.service'; - -xdescribe(`MotionExportService`, () => { - let service: MotionExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-html-to-pdf.service/motion-html-to-pdf.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-html-to-pdf.service/motion-html-to-pdf.service.spec.ts deleted file mode 100644 index 803544d395..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-html-to-pdf.service/motion-html-to-pdf.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionHtmlToPdfService } from './motion-html-to-pdf.service'; - -xdescribe(`MotionHtmlToPdfService`, () => { - let service: MotionHtmlToPdfService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionHtmlToPdfService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-catalog.service/motion-pdf-catalog.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-catalog.service/motion-pdf-catalog.service.spec.ts deleted file mode 100644 index c95131a306..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-catalog.service/motion-pdf-catalog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionPdfCatalogService } from './motion-pdf-catalog.service'; - -xdescribe(`MotionPdfCatalogService`, () => { - let service: MotionPdfCatalogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionPdfCatalogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-export.service/motion-pdf-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-export.service/motion-pdf-export.service.spec.ts deleted file mode 100644 index 335f055c67..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-export.service/motion-pdf-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionPdfExportService } from './motion-pdf-export.service'; - -xdescribe(`MotionPdfExportService`, () => { - let service: MotionPdfExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionPdfExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf.service/motion-pdf.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf.service/motion-pdf.service.spec.ts deleted file mode 100644 index 0d40749cc5..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf.service/motion-pdf.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionPdfService } from './motion-pdf.service'; - -xdescribe(`MotionPdfService`, () => { - let service: MotionPdfService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionPdfService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-xlsx-export.service/motion-xlsx-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-xlsx-export.service/motion-xlsx-export.service.spec.ts deleted file mode 100644 index 4e8cc69933..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-xlsx-export.service/motion-xlsx-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionXlsxExportService } from './motion-xlsx-export.service'; - -xdescribe(`MotionXlsxExportService`, () => { - let service: MotionXlsxExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionXlsxExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-filter.service/amendment-list-filter.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-filter.service/amendment-list-filter.service.spec.ts deleted file mode 100644 index 975062778d..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-filter.service/amendment-list-filter.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AmendmentListFilterService } from './amendment-list-filter.service'; - -xdescribe(`AmendmentListFilterService`, () => { - let service: AmendmentListFilterService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AmendmentListFilterService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-sort.service/amendment-list-sort.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-sort.service/amendment-list-sort.service.spec.ts deleted file mode 100644 index e063d928a2..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-sort.service/amendment-list-sort.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AmendmentListSortService } from './amendment-list-sort.service'; - -xdescribe(`AmendmentListSortService`, () => { - let service: AmendmentListSortService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AmendmentListSortService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-base-sort.service/motion-list-base-sort.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-base-sort.service/motion-list-base-sort.service.spec.ts deleted file mode 100644 index f91a0be4be..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-base-sort.service/motion-list-base-sort.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionListBaseSortService } from './motion-list-base-sort.service'; - -xdescribe(`MotionListBaseSortService`, () => { - let service: MotionListBaseSortService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionListBaseSortService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-filter.service/motion-list-filter.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-filter.service/motion-list-filter.service.spec.ts deleted file mode 100644 index b7aaf39dce..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-filter.service/motion-list-filter.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionListFilterService } from './motion-list-filter.service'; - -xdescribe(`MotionListFilterService`, () => { - let service: MotionListFilterService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionListFilterService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-sort.service/motion-list-sort.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-sort.service/motion-list-sort.service.spec.ts deleted file mode 100644 index 7e7ac38922..0000000000 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-sort.service/motion-list-sort.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MotionListSortService } from './motion-list-sort.service'; - -xdescribe(`MotionListSortService`, () => { - let service: MotionListSortService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MotionListSortService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.spec.ts deleted file mode 100644 index 6e27fe9dc5..0000000000 --- a/client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ParticipantCsvExportService } from './participant-csv-export.service'; - -xdescribe(`ParticipantCsvExportService`, () => { - let service: ParticipantCsvExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ParticipantCsvExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf-export.service/participant-pdf-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf-export.service/participant-pdf-export.service.spec.ts deleted file mode 100644 index a77e83c8ea..0000000000 --- a/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf-export.service/participant-pdf-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ParticipantPdfExportService } from './participant-pdf-export.service'; - -xdescribe(`ParticipantPdfExportService`, () => { - let service: ParticipantPdfExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ParticipantPdfExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf.service/participant-pdf.service.spec.ts b/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf.service/participant-pdf.service.spec.ts deleted file mode 100644 index 74c91c3450..0000000000 --- a/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf.service/participant-pdf.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ParticipantPdfService } from './participant-pdf.service'; - -xdescribe(`ParticipantPdfService`, () => { - let service: ParticipantPdfService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ParticipantPdfService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/participants/export/speaker-csv-export.service/speaker-csv-export.service.spec.ts b/client/src/app/site/pages/meetings/pages/participants/export/speaker-csv-export.service/speaker-csv-export.service.spec.ts deleted file mode 100644 index deeecc5321..0000000000 --- a/client/src/app/site/pages/meetings/pages/participants/export/speaker-csv-export.service/speaker-csv-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { SpeakerCsvExportService } from './speaker-csv-export.service'; - -xdescribe(`ParticipantCsvExportService`, () => { - let service: SpeakerCsvExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(SpeakerCsvExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/participants/modules/groups/services/group-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/participants/modules/groups/services/group-controller.service.spec.ts deleted file mode 100644 index a4c0bfbc6b..0000000000 --- a/client/src/app/site/pages/meetings/pages/participants/modules/groups/services/group-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { GroupControllerService } from './group-controller.service'; - -xdescribe(`GroupControllerService`, () => { - let service: GroupControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(GroupControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/services/participant-import.service/participant-import.service.spec.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/services/participant-import.service/participant-import.service.spec.ts deleted file mode 100644 index cf1144a431..0000000000 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/services/participant-import.service/participant-import.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ParticipantImportService } from './participant-import.service'; - -xdescribe(`ParticipantImportService`, () => { - let service: ParticipantImportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ParticipantImportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.spec.ts deleted file mode 100644 index ca4b35c80b..0000000000 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ParticipantListInfoDialogService } from './participant-list-info-dialog.service'; - -xdescribe(`ParticipantListInfoDialogService`, () => { - let service: ParticipantListInfoDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ParticipantListInfoDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.spec.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.spec.ts deleted file mode 100644 index e7863bafe0..0000000000 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ParticipantListFilterService } from './participant-list-filter.service'; - -xdescribe(`ParticipantListFilterService`, () => { - let service: ParticipantListFilterService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ParticipantListFilterService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service.spec.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service.spec.ts deleted file mode 100644 index af60b5cc2d..0000000000 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ParticipantListSortService } from './participant-list-sort.service'; - -xdescribe(`ParticipantListSortService`, () => { - let service: ParticipantListSortService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ParticipantListSortService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-filter.service/participant-speaker-list-filter.service.spec.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-filter.service/participant-speaker-list-filter.service.spec.ts deleted file mode 100644 index b6396212d5..0000000000 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-filter.service/participant-speaker-list-filter.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ParticipantSpeakerListFilterService } from './participant-speaker-list-filter.service'; - -xdescribe(`ParticipantSpeakerListFilterService`, () => { - let service: ParticipantSpeakerListFilterService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ParticipantSpeakerListFilterService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-sort.service/participant-speaker-list-sort.service.spec.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-sort.service/participant-speaker-list-sort.service.spec.ts deleted file mode 100644 index 66d25a76f6..0000000000 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-sort.service/participant-speaker-list-sort.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ParticipantSpeakerListSortService } from './participant-speaker-list-sort.service'; - -xdescribe(`ParticipantSpeakerListSortService`, () => { - let service: ParticipantSpeakerListSortService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ParticipantSpeakerListSortService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.spec.ts deleted file mode 100644 index 4e9a5d7203..0000000000 --- a/client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ParticipantControllerService } from './participant-controller.service'; - -xdescribe(`ParticipantControllerService`, () => { - let service: ParticipantControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ParticipantControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.spec.ts b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.spec.ts deleted file mode 100644 index ac02119547..0000000000 --- a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PollListFilterService } from './poll-list-filter.service'; - -xdescribe(`PollListFilterService`, () => { - let service: PollListFilterService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PollListFilterService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/services/projector-countdown-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/services/projector-countdown-dialog.service.spec.ts deleted file mode 100644 index b76dc6e709..0000000000 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/services/projector-countdown-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectorCountdownDialogService } from './projector-countdown-dialog.service'; - -xdescribe(`ProjectorCountdownDialogService`, () => { - let service: ProjectorCountdownDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectorCountdownDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/services/projector-edit-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/services/projector-edit-dialog.service.spec.ts deleted file mode 100644 index 713d257f60..0000000000 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/services/projector-edit-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectorEditDialogService } from './projector-edit-dialog.service'; - -xdescribe(`ProjectorEditDialogService`, () => { - let service: ProjectorEditDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectorEditDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/services/projector-message-dialog.service.spec.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/services/projector-message-dialog.service.spec.ts deleted file mode 100644 index ab2179e7bf..0000000000 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/services/projector-message-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectorMessageDialogService } from './projector-message-dialog.service'; - -xdescribe(`ProjectorMessageDialogService`, () => { - let service: ProjectorMessageDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectorMessageDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/current-speaker-chyron-slide.service/current-speaker-chyron-slide.service.spec.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/current-speaker-chyron-slide.service/current-speaker-chyron-slide.service.spec.ts deleted file mode 100644 index c9a6fe2f05..0000000000 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/current-speaker-chyron-slide.service/current-speaker-chyron-slide.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CurrentSpeakerChyronSlideService } from './current-speaker-chyron-slide.service'; - -xdescribe(`CurrentSpeakerChyronSlideService`, () => { - let service: CurrentSpeakerChyronSlideService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CurrentSpeakerChyronSlideService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projection-controller.service/projection-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projection-controller.service/projection-controller.service.spec.ts deleted file mode 100644 index 265f0bb047..0000000000 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projection-controller.service/projection-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectionControllerService } from './projection-controller.service'; - -xdescribe(`ProjectionControllerService`, () => { - let service: ProjectionControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectionControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-countdown-controller.service/projector-countdown-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-countdown-controller.service/projector-countdown-controller.service.spec.ts deleted file mode 100644 index 2f1a99b26c..0000000000 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-countdown-controller.service/projector-countdown-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectorCountdownControllerService } from './projector-countdown-controller.service'; - -xdescribe(`ProjectorCountdownControllerService`, () => { - let service: ProjectorCountdownControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectorCountdownControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-message-controller.service/projector-message-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-message-controller.service/projector-message-controller.service.spec.ts deleted file mode 100644 index 52d88eea5d..0000000000 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-message-controller.service/projector-message-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectorMessageControllerService } from './projector-message-controller.service'; - -xdescribe(`ProjectorMessageControllerService`, () => { - let service: ProjectorMessageControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectorMessageControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/pages/projectors/services/projector-controller.service.spec.ts b/client/src/app/site/pages/meetings/pages/projectors/services/projector-controller.service.spec.ts deleted file mode 100644 index 24ea156736..0000000000 --- a/client/src/app/site/pages/meetings/pages/projectors/services/projector-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProjectorControllerService } from './projector-controller.service'; - -xdescribe(`ProjectorControllerService`, () => { - let service: ProjectorControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ProjectorControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/active-meeting-id.service.spec.ts b/client/src/app/site/pages/meetings/services/active-meeting-id.service.spec.ts deleted file mode 100644 index 335ba8d451..0000000000 --- a/client/src/app/site/pages/meetings/services/active-meeting-id.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ActiveMeetingIdService } from './active-meeting-id.service'; - -xdescribe(`ActiveMeetingIdService`, () => { - let service: ActiveMeetingIdService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ActiveMeetingIdService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/active-meeting.service.spec.ts b/client/src/app/site/pages/meetings/services/active-meeting.service.spec.ts deleted file mode 100644 index 8dc6df318c..0000000000 --- a/client/src/app/site/pages/meetings/services/active-meeting.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ActiveMeetingService } from './active-meeting.service'; - -xdescribe(`ActiveMeetingService`, () => { - let service: ActiveMeetingService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ActiveMeetingService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/archive-status.service.spec.ts b/client/src/app/site/pages/meetings/services/archive-status.service.spec.ts deleted file mode 100644 index 9c0aaa3681..0000000000 --- a/client/src/app/site/pages/meetings/services/archive-status.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ArchiveStatusService } from './archive-status.service'; - -xdescribe(`ArchiveStatusService`, () => { - let service: ArchiveStatusService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ArchiveStatusService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service.spec.ts b/client/src/app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service.spec.ts deleted file mode 100644 index bf7f45f102..0000000000 --- a/client/src/app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingCsvExportForBackendService } from './meeting-csv-export-for-backend.service'; - -xdescribe(`MeetingCsvExportForBackendService`, () => { - let service: MeetingCsvExportForBackendService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingCsvExportForBackendService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/export/meeting-csv-export.service.spec.ts b/client/src/app/site/pages/meetings/services/export/meeting-csv-export.service.spec.ts deleted file mode 100644 index fbae26b3e1..0000000000 --- a/client/src/app/site/pages/meetings/services/export/meeting-csv-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingCsvExportService } from './meeting-csv-export.service'; - -xdescribe(`MeetingCsvExportService`, () => { - let service: MeetingCsvExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingCsvExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/export/meeting-pdf-export.service.spec.ts b/client/src/app/site/pages/meetings/services/export/meeting-pdf-export.service.spec.ts deleted file mode 100644 index e253a00df4..0000000000 --- a/client/src/app/site/pages/meetings/services/export/meeting-pdf-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingPdfExportService } from './meeting-pdf-export.service'; - -xdescribe(`MeetingPdfExportService`, () => { - let service: MeetingPdfExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingPdfExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/load-font.service.spec.ts b/client/src/app/site/pages/meetings/services/load-font.service.spec.ts deleted file mode 100644 index 40c07e6aa3..0000000000 --- a/client/src/app/site/pages/meetings/services/load-font.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { LoadFontService } from './load-font.service'; - -xdescribe(`LoadFontService`, () => { - let service: LoadFontService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(LoadFontService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/media-manage.service.spec.ts b/client/src/app/site/pages/meetings/services/media-manage.service.spec.ts deleted file mode 100644 index ada593078f..0000000000 --- a/client/src/app/site/pages/meetings/services/media-manage.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MediaManageService } from './media-manage.service'; - -xdescribe(`MediaManageService`, () => { - let service: MediaManageService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MediaManageService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/meeting-collection-mapper.service.spec.ts b/client/src/app/site/pages/meetings/services/meeting-collection-mapper.service.spec.ts deleted file mode 100644 index de43440a55..0000000000 --- a/client/src/app/site/pages/meetings/services/meeting-collection-mapper.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingCollectionMapperService } from './meeting-collection-mapper.service'; - -xdescribe(`MeetingCollectionMapperService`, () => { - let service: MeetingCollectionMapperService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingCollectionMapperService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.spec.ts b/client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.spec.ts deleted file mode 100644 index b19d1b26af..0000000000 --- a/client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingComponentServiceCollectorService } from './meeting-component-service-collector.service'; - -xdescribe(`MeetingComponentServiceCollectorService`, () => { - let service: MeetingComponentServiceCollectorService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingComponentServiceCollectorService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/meeting-controller-service-collector.service.spec.ts b/client/src/app/site/pages/meetings/services/meeting-controller-service-collector.service.spec.ts deleted file mode 100644 index a193fffdb0..0000000000 --- a/client/src/app/site/pages/meetings/services/meeting-controller-service-collector.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingControllerServiceCollectorService } from './meeting-controller-service-collector.service'; - -xdescribe(`MeetingControllerServiceCollectorService`, () => { - let service: MeetingControllerServiceCollectorService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingControllerServiceCollectorService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/meeting-data-store.service.spec.ts b/client/src/app/site/pages/meetings/services/meeting-data-store.service.spec.ts deleted file mode 100644 index 25bec6f3f7..0000000000 --- a/client/src/app/site/pages/meetings/services/meeting-data-store.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingDataStoreService } from './meeting-data-store.service'; - -xdescribe(`MeetingDataStoreService`, () => { - let service: MeetingDataStoreService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingDataStoreService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/meeting-settings.service.spec.ts b/client/src/app/site/pages/meetings/services/meeting-settings.service.spec.ts deleted file mode 100644 index d2a77739b3..0000000000 --- a/client/src/app/site/pages/meetings/services/meeting-settings.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingSettingsService } from './meeting-settings.service'; - -xdescribe(`MeetingSettingsService`, () => { - let service: MeetingSettingsService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingSettingsService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.spec.ts b/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.spec.ts deleted file mode 100644 index 2908880d67..0000000000 --- a/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { SequentialNumberMappingService } from './sequential-number-mapping.service'; - -xdescribe(`SequentialNumberMappingService`, () => { - let service: SequentialNumberMappingService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(SequentialNumberMappingService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.spec.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.spec.ts deleted file mode 100644 index 82934d7320..0000000000 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AccountImportService } from './account-import.service'; - -xdescribe(`AccountImportService`, () => { - let service: AccountImportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AccountImportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-search/account-list-search.service.spec.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-search/account-list-search.service.spec.ts deleted file mode 100644 index cc28402f2a..0000000000 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-search/account-list-search.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AccountListSearchService } from './account-list-search.service'; - -xdescribe(`AccountListSearchService`, () => { - let service: AccountListSearchService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AccountListSearchService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service.spec.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service.spec.ts deleted file mode 100644 index d72a835005..0000000000 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AccountSortService } from './account-sort.service'; - -xdescribe(`AccountSortService`, () => { - let service: AccountSortService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AccountSortService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service.spec.ts b/client/src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service.spec.ts deleted file mode 100644 index 96f3ff757b..0000000000 --- a/client/src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { GenderControllerService } from './gender-controller.service'; - -xdescribe(`GenderControllerService`, () => { - let service: GenderControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(GenderControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.spec.ts b/client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.spec.ts deleted file mode 100644 index c9e37c1f24..0000000000 --- a/client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AccountExportService } from './account-export.service'; - -xdescribe(`AccountExportService`, () => { - let service: AccountExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AccountExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/accounts/services/common/account-controller.service.spec.ts b/client/src/app/site/pages/organization/pages/accounts/services/common/account-controller.service.spec.ts deleted file mode 100644 index b71740f2c8..0000000000 --- a/client/src/app/site/pages/organization/pages/accounts/services/common/account-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AccountControllerService } from './account-controller.service'; - -xdescribe(`AccountControllerService`, () => { - let service: AccountControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AccountControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/accounts/services/common/account-filter.service.spec.ts b/client/src/app/site/pages/organization/pages/accounts/services/common/account-filter.service.spec.ts deleted file mode 100644 index 276beff989..0000000000 --- a/client/src/app/site/pages/organization/pages/accounts/services/common/account-filter.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AccountFilterService } from './account-filter.service'; - -xdescribe(`AccountFilterService`, () => { - let service: AccountFilterService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AccountFilterService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.spec.ts b/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.spec.ts deleted file mode 100644 index 4d84bdb099..0000000000 --- a/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingService } from './meeting.service'; - -xdescribe(`MeetingService`, () => { - let service: MeetingService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.spec.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.spec.ts deleted file mode 100644 index 778653dbce..0000000000 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CommitteeImportService } from './committee-import.service'; - -xdescribe(`CommitteeImportService`, () => { - let service: CommitteeImportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CommitteeImportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.spec.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.spec.ts deleted file mode 100644 index a5628283ca..0000000000 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CommitteeExportService } from './committee-export.service'; - -xdescribe(`CommitteeExportService`, () => { - let service: CommitteeExportService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CommitteeExportService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-filter.service/committee-filter.service.spec.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-filter.service/committee-filter.service.spec.ts deleted file mode 100644 index e32f49d8cb..0000000000 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-filter.service/committee-filter.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CommitteeFilterService } from './committee-filter.service'; - -xdescribe(`CommitteeFilterService`, () => { - let service: CommitteeFilterService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CommitteeFilterService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service.spec.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service.spec.ts deleted file mode 100644 index 13fb22f472..0000000000 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CommitteeSortService } from './committee-sort.service'; - -xdescribe(`CommitteeSortService`, () => { - let service: CommitteeSortService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CommitteeSortService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/committees/services/committee-controller.service.spec.ts b/client/src/app/site/pages/organization/pages/committees/services/committee-controller.service.spec.ts deleted file mode 100644 index 46c1eb40be..0000000000 --- a/client/src/app/site/pages/organization/pages/committees/services/committee-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CommitteeControllerService } from './committee-controller.service'; - -xdescribe(`CommitteeControllerService`, () => { - let service: CommitteeControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CommitteeControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/services/theme-builder-dialog.service.spec.ts b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/services/theme-builder-dialog.service.spec.ts deleted file mode 100644 index 73a1fcaf07..0000000000 --- a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/services/theme-builder-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ThemeBuilderDialogService } from './theme-builder-dialog.service'; - -xdescribe(`ThemeBuilderDialogService`, () => { - let service: ThemeBuilderDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ThemeBuilderDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/designs/services/theme-controller.service.spec.ts b/client/src/app/site/pages/organization/pages/designs/services/theme-controller.service.spec.ts deleted file mode 100644 index 82b11e30e1..0000000000 --- a/client/src/app/site/pages/organization/pages/designs/services/theme-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ThemeControllerService } from './theme-controller.service'; - -xdescribe(`ThemeControllerService`, () => { - let service: ThemeControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ThemeControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-filter/meeting-list-filter.service.spec.ts b/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-filter/meeting-list-filter.service.spec.ts deleted file mode 100644 index ab985a438e..0000000000 --- a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-filter/meeting-list-filter.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingListFilterService } from './meeting-list-filter.service'; - -xdescribe(`MeetingListFilterService`, () => { - let service: MeetingListFilterService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingListFilterService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-sort/meeting-list-sort.service.spec.ts b/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-sort/meeting-list-sort.service.spec.ts deleted file mode 100644 index 7ce36a05d8..0000000000 --- a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-sort/meeting-list-sort.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { MeetingListSortService } from './meeting-list-sort.service'; - -xdescribe(`MeetingListSortService`, () => { - let service: MeetingListSortService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(MeetingListSortService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/services/organization-tag-dialog.service.spec.ts b/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/services/organization-tag-dialog.service.spec.ts deleted file mode 100644 index 8434b9a37d..0000000000 --- a/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/services/organization-tag-dialog.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OrganizationTagDialogService } from './organization-tag-dialog.service'; - -xdescribe(`OrganizationTagDialogService`, () => { - let service: OrganizationTagDialogService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OrganizationTagDialogService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service/organization-tag-controller.service.spec.ts b/client/src/app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service/organization-tag-controller.service.spec.ts deleted file mode 100644 index f1ef9d5af5..0000000000 --- a/client/src/app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service/organization-tag-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OrganizationTagControllerService } from './organization-tag-controller.service'; - -xdescribe(`OrganizationTagControllerService`, () => { - let service: OrganizationTagControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OrganizationTagControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/services/organization-controller.service.spec.ts b/client/src/app/site/pages/organization/services/organization-controller.service.spec.ts deleted file mode 100644 index 0717059d80..0000000000 --- a/client/src/app/site/pages/organization/services/organization-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OrganizationControllerService } from './organization-controller.service'; - -xdescribe(`OrganizationControllerService`, () => { - let service: OrganizationControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OrganizationControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/services/organization-settings.service.spec.ts b/client/src/app/site/pages/organization/services/organization-settings.service.spec.ts deleted file mode 100644 index f2a7304eeb..0000000000 --- a/client/src/app/site/pages/organization/services/organization-settings.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OrganizationSettingsService } from './organization-settings.service'; - -xdescribe(`OrganizationSettingsService`, () => { - let service: OrganizationSettingsService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OrganizationSettingsService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/pages/organization/services/organization.service.spec.ts b/client/src/app/site/pages/organization/services/organization.service.spec.ts deleted file mode 100644 index 2932049609..0000000000 --- a/client/src/app/site/pages/organization/services/organization.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OrganizationService } from './organization.service'; - -xdescribe(`OrganizationService`, () => { - let service: OrganizationService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OrganizationService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/auth-check.service.spec.ts b/client/src/app/site/services/auth-check.service.spec.ts deleted file mode 100644 index 098d557bcb..0000000000 --- a/client/src/app/site/services/auth-check.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AuthCheckService } from './auth-check.service'; - -xdescribe(`AuthCheckService`, () => { - let service: AuthCheckService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AuthCheckService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/auth.service.spec.ts b/client/src/app/site/services/auth.service.spec.ts deleted file mode 100644 index dbd020ba89..0000000000 --- a/client/src/app/site/services/auth.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AuthService } from './auth.service'; - -xdescribe(`AuthService`, () => { - let service: AuthService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AuthService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/autoupdate/autoupdate.service.spec.ts b/client/src/app/site/services/autoupdate/autoupdate.service.spec.ts deleted file mode 100644 index 03d57e04c1..0000000000 --- a/client/src/app/site/services/autoupdate/autoupdate.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AutoupdateService } from './autoupdate.service'; - -xdescribe(`AutoupdateService`, () => { - let service: AutoupdateService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AutoupdateService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/collection-mapper.service/collection-mapper.service.spec.ts b/client/src/app/site/services/collection-mapper.service/collection-mapper.service.spec.ts deleted file mode 100644 index b6155b5028..0000000000 --- a/client/src/app/site/services/collection-mapper.service/collection-mapper.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CollectionMapperService } from './collection-mapper.service'; - -xdescribe(`CollectionMapperService`, () => { - let service: CollectionMapperService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CollectionMapperService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/component-service-collector.service.spec.ts b/client/src/app/site/services/component-service-collector.service.spec.ts deleted file mode 100644 index 111e9d03ab..0000000000 --- a/client/src/app/site/services/component-service-collector.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ComponentServiceCollectorService } from './component-service-collector.service'; - -xdescribe(`ComponentServiceCollectorService`, () => { - let service: ComponentServiceCollectorService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ComponentServiceCollectorService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/controller-service-collector.service.spec.ts b/client/src/app/site/services/controller-service-collector.service.spec.ts deleted file mode 100644 index a1ab28c44a..0000000000 --- a/client/src/app/site/services/controller-service-collector.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ControllerServiceCollectorService } from './controller-service-collector.service'; - -xdescribe(`ControllerServiceCollectorService`, () => { - let service: ControllerServiceCollectorService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ControllerServiceCollectorService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/data-store-update-manager.service.spec.ts b/client/src/app/site/services/data-store-update-manager.service.spec.ts deleted file mode 100644 index d950053503..0000000000 --- a/client/src/app/site/services/data-store-update-manager.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { DataStoreUpdateManagerService } from './data-store-update-manager.service'; - -xdescribe(`DataStoreUpdateManagerService`, () => { - let service: DataStoreUpdateManagerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(DataStoreUpdateManagerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/data-store.service.spec.ts b/client/src/app/site/services/data-store.service.spec.ts deleted file mode 100644 index e51d4c113f..0000000000 --- a/client/src/app/site/services/data-store.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { DataStoreService } from './data-store.service'; - -xdescribe(`DataStoreService`, () => { - let service: DataStoreService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(DataStoreService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/import-service-collector.service.spec.ts b/client/src/app/site/services/import-service-collector.service.spec.ts deleted file mode 100644 index 5e182e88b5..0000000000 --- a/client/src/app/site/services/import-service-collector.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ImportServiceCollectorService } from './import-service-collector.service'; - -xdescribe(`ImportServiceCollectorService`, () => { - let service: ImportServiceCollectorService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ImportServiceCollectorService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/model-request-builder/model-request-builder.service.spec.ts b/client/src/app/site/services/model-request-builder/model-request-builder.service.spec.ts deleted file mode 100644 index 157612d1b8..0000000000 --- a/client/src/app/site/services/model-request-builder/model-request-builder.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ModelRequestBuilderService } from './model-request-builder.service'; - -xdescribe(`ModelRequestBuilderService`, () => { - let service: ModelRequestBuilderService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ModelRequestBuilderService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/model-request.service.spec.ts b/client/src/app/site/services/model-request.service.spec.ts deleted file mode 100644 index c8a2a2c6c1..0000000000 --- a/client/src/app/site/services/model-request.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ModelRequestService } from './model-request.service'; - -xdescribe(`ModelRequestService`, () => { - let service: ModelRequestService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ModelRequestService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/openslides-router.service.spec.ts b/client/src/app/site/services/openslides-router.service.spec.ts deleted file mode 100644 index dddcf4c71c..0000000000 --- a/client/src/app/site/services/openslides-router.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OpenSlidesRouterService } from './openslides-router.service'; - -xdescribe(`OpenslidesRouterService`, () => { - let service: OpenSlidesRouterService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OpenSlidesRouterService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/openslides.service.spec.ts b/client/src/app/site/services/openslides.service.spec.ts deleted file mode 100644 index b925a5f921..0000000000 --- a/client/src/app/site/services/openslides.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OpenSlidesService } from './openslides.service'; - -xdescribe(`OpenSlidesService`, () => { - let service: OpenSlidesService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OpenSlidesService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/operator.service.spec.ts b/client/src/app/site/services/operator.service.spec.ts deleted file mode 100644 index 84cc522ba7..0000000000 --- a/client/src/app/site/services/operator.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OperatorService } from './operator.service'; - -xdescribe(`OperatorService`, () => { - let service: OperatorService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OperatorService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/relation-manager.service.spec.ts b/client/src/app/site/services/relation-manager.service.spec.ts deleted file mode 100644 index 11d2c5e8e5..0000000000 --- a/client/src/app/site/services/relation-manager.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { RelationManagerService } from './relation-manager.service'; - -xdescribe(`RelationManagerService`, () => { - let service: RelationManagerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(RelationManagerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/reroute.service.spec.ts b/client/src/app/site/services/reroute.service.spec.ts deleted file mode 100644 index 8486fedc92..0000000000 --- a/client/src/app/site/services/reroute.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { RerouteService } from './reroute.service'; - -xdescribe(`RerouteService`, () => { - let service: RerouteService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(RerouteService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/user-controller.service.spec.ts b/client/src/app/site/services/user-controller.service.spec.ts deleted file mode 100644 index dd5c0eb794..0000000000 --- a/client/src/app/site/services/user-controller.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { UserControllerService } from './user-controller.service'; - -xdescribe(`UserControllerService`, () => { - let service: UserControllerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(UserControllerService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/user.service.spec.ts b/client/src/app/site/services/user.service.spec.ts deleted file mode 100644 index 4343f80224..0000000000 --- a/client/src/app/site/services/user.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { UserService } from './user.service'; - -xdescribe(`UserService`, () => { - let service: UserService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(UserService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/view-model-store-update.service.spec.ts b/client/src/app/site/services/view-model-store-update.service.spec.ts deleted file mode 100644 index 6b74582473..0000000000 --- a/client/src/app/site/services/view-model-store-update.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ViewModelStoreUpdateService } from './view-model-store-update.service'; - -xdescribe(`ViewModelStoreUdpateService`, () => { - let service: ViewModelStoreUpdateService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ViewModelStoreUpdateService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/site/services/view-port.service.spec.ts b/client/src/app/site/services/view-port.service.spec.ts deleted file mode 100644 index 23e83c808d..0000000000 --- a/client/src/app/site/services/view-port.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ViewPortService } from './view-port.service'; - -xdescribe(`ViewPortService`, () => { - let service: ViewPortService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ViewPortService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/ui/modules/choice-dialog/services/choice.service.spec.ts b/client/src/app/ui/modules/choice-dialog/services/choice.service.spec.ts deleted file mode 100644 index 0d4fed0e40..0000000000 --- a/client/src/app/ui/modules/choice-dialog/services/choice.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ChoiceService } from './choice.service'; - -xdescribe(`ChoiceService`, () => { - let service: ChoiceService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ChoiceService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/ui/modules/head-bar/services/routing-state.service.spec.ts b/client/src/app/ui/modules/head-bar/services/routing-state.service.spec.ts deleted file mode 100644 index 91f1c73e84..0000000000 --- a/client/src/app/ui/modules/head-bar/services/routing-state.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { RoutingStateService } from './routing-state.service'; - -xdescribe(`RoutingStateService`, () => { - let service: RoutingStateService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(RoutingStateService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/ui/modules/openslides-overlay/services/overlay.service.spec.ts b/client/src/app/ui/modules/openslides-overlay/services/overlay.service.spec.ts deleted file mode 100644 index 4442360120..0000000000 --- a/client/src/app/ui/modules/openslides-overlay/services/overlay.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OverlayService } from './overlay.service'; - -xdescribe(`OverlayService`, () => { - let service: OverlayService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OverlayService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/ui/modules/prompt-dialog/services/prompt.service.spec.ts b/client/src/app/ui/modules/prompt-dialog/services/prompt.service.spec.ts deleted file mode 100644 index 69166ebbd1..0000000000 --- a/client/src/app/ui/modules/prompt-dialog/services/prompt.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { PromptService } from './prompt.service'; - -xdescribe(`PromptService`, () => { - let service: PromptService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(PromptService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/ui/modules/scrolling-table/services/scrolling-table-manage.service.spec.ts b/client/src/app/ui/modules/scrolling-table/services/scrolling-table-manage.service.spec.ts deleted file mode 100644 index a61d9bd0c9..0000000000 --- a/client/src/app/ui/modules/scrolling-table/services/scrolling-table-manage.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ScrollingTableManageService } from './scrolling-table-manage.service'; - -xdescribe(`ScrollingTableManageService`, () => { - let service: ScrollingTableManageService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ScrollingTableManageService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/services/easter-egg-content-platform.service.spec.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/services/easter-egg-content-platform.service.spec.ts deleted file mode 100644 index 87cbf303c7..0000000000 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/services/easter-egg-content-platform.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { EasterEggContentPlatformService } from './easter-egg-content-platform.service'; - -xdescribe(`EasterEggContentPlatformService`, () => { - let service: EasterEggContentPlatformService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(EasterEggContentPlatformService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.spec.ts b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.spec.ts deleted file mode 100644 index aa9301966e..0000000000 --- a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { TreeService } from './tree.service'; - -xdescribe(`TreeService`, () => { - let service: TreeService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(TreeService); - }); - - it(`should be created`, () => { - expect(service).toBeTruthy(); - }); -}); From 62ff77f8198ceac57b5c05266e910c4518a4c061 Mon Sep 17 00:00:00 2001 From: Loki Elble <69210919+Elblinator@users.noreply.github.com> Date: Thu, 9 Jul 2026 14:02:05 +0200 Subject: [PATCH 38/71] Update to inject (#6360) --- .../gateways/actions/action.service.spec.ts | 2 -- .../app/gateways/actions/action.service.ts | 4 +-- .../src/app/gateways/auth-adapter.service.ts | 4 +-- client/src/app/gateways/http.service.ts | 14 ++++---- .../gateways/meeting-media-adapter.service.ts | 4 +-- .../get-user-editable-presenter.service.ts | 4 +-- .../users/user-repository.service.ts | 13 ++++--- .../utils/import/json-import-file-utils.ts | 10 +++--- .../openslides-main.component.ts | 34 +++++++++---------- .../interceptors/auth-token.interceptor.ts | 4 +-- .../services/app-load.service.ts | 16 ++++----- .../services/shared-worker.service.ts | 6 ++-- client/src/app/site/guards/auth.guard.ts | 12 +++---- .../src/app/site/guards/permission.guard.ts | 12 +++---- .../chip-select/chip-select.component.html | 12 +++---- .../chip-select/chip-select.component.ts | 10 ++---- .../account-button.component.ts | 25 +++++++------- .../account-dialog.component.ts | 22 +++++------- .../global-search/global-search.component.ts | 34 ++++++++++--------- .../services/active-meeting.service.ts | 26 +++++++------- ...ing-component-service-collector.service.ts | 12 +++---- .../sequential-number-mapping.service.ts | 13 ++++--- .../committee-meeting-preview.component.ts | 14 ++++---- .../modules/services/meeting.service.ts | 12 +++---- .../committee-import-list.component.ts | 6 +--- .../committee-import.service.ts | 11 +++--- .../organization-settings.component.ts | 3 +- .../autofocus/autofocus.directive.ts | 10 ++---- .../meeting-setting.directive.ts | 11 +++--- .../ui/directives/paper/paper.directive.ts | 4 +-- .../directives/resized/resized.directive.ts | 4 +-- .../trim-on-paste/trim-on-paste.directive.ts | 4 +-- .../src/app/ui/modules/chip/chip.component.ts | 10 +++--- .../choice-dialog/services/choice.service.ts | 4 +-- .../comma-separated-listing.component.ts | 2 -- .../editor-image-dialog.component.ts | 9 +++-- .../components/editor/editor.component.ts | 4 --- .../directives/tab-navigation.directive.ts | 4 +-- .../expandable-content-wrapper.component.ts | 6 ++-- .../modules/file-list/file-list.component.ts | 21 ++++++------ .../components/head-bar/head-bar.component.ts | 20 +++++------ .../services/routing-state.service.ts | 15 ++++---- .../head-toolbar/head-toolbar.component.ts | 10 ++---- .../backend-import-list.component.ts | 7 ++-- .../import-list-first-tab.directive.ts | 4 +-- .../import-list-last-tab.directive.ts | 4 +-- .../filter-menu/filter-menu.component.ts | 3 +- .../sort-filter-bar.component.ts | 9 +++-- .../media-upload-content.component.ts | 6 ++-- .../meeting-time/meeting-time.component.ts | 4 +-- .../openslides-date-adapter.ts | 15 ++++---- .../prompt-checkbox.component.ts | 4 +-- .../prompt-dialog/services/prompt.service.ts | 8 ++--- .../ui/modules/qr-code/qr-code.component.ts | 2 -- .../scrolling-table.component.ts | 10 ++---- .../scrolling-table-no-data.directive.ts | 10 +++--- .../repo-search-selector.component.ts | 11 +++--- .../copyright-sign.component.ts | 4 +-- .../components/image/image.component.ts | 4 +-- .../sidenav/components/logo/logo.component.ts | 10 ++---- .../components/sidenav/sidenav.component.ts | 4 +-- .../services/chess-challenge.service.ts | 12 +++---- .../sorting-tree/sorting-tree.component.ts | 14 ++------ .../src/app/ui/pipes/entries/entries.pipe.ts | 4 +-- client/src/app/ui/pipes/time/time.pipe.ts | 4 +-- client/src/app/ui/pipes/trust/trust.pipe.ts | 4 +-- 66 files changed, 277 insertions(+), 357 deletions(-) diff --git a/client/src/app/gateways/actions/action.service.spec.ts b/client/src/app/gateways/actions/action.service.spec.ts index 9a7e0e7c06..00351f2f1f 100644 --- a/client/src/app/gateways/actions/action.service.spec.ts +++ b/client/src/app/gateways/actions/action.service.spec.ts @@ -14,8 +14,6 @@ class MockHttpService { public returnType: `response` | `error` | `nothing` | `too little` | `non-response` | `no results` = `response`; - public constructor() {} - public async post(path: string, data: any, queryParams: QueryParams): Promise { this.lastPosts.push({ path, data, queryParams }); if ( diff --git a/client/src/app/gateways/actions/action.service.ts b/client/src/app/gateways/actions/action.service.ts index f2c0e7c36f..af3fc8cc9a 100644 --- a/client/src/app/gateways/actions/action.service.ts +++ b/client/src/app/gateways/actions/action.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { HttpService } from '../http.service'; import { Action } from './action'; @@ -16,7 +16,7 @@ let uniqueFnId = 0; export class ActionService { private readonly _beforeActionFnMap: Record = {}; - public constructor(private http: HttpService) {} + private http = inject(HttpService); /** * Registers a boolean function that will be used to check if actions should currently be allowed to be sent. diff --git a/client/src/app/gateways/auth-adapter.service.ts b/client/src/app/gateways/auth-adapter.service.ts index 00d9a1870b..022e566932 100644 --- a/client/src/app/gateways/auth-adapter.service.ts +++ b/client/src/app/gateways/auth-adapter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { environment } from '../../environments/environment'; import { HttpService } from './http.service'; @@ -21,7 +21,7 @@ export class AuthAdapterService { return `${this.authUrl}/${environment.authSecurePrefix}`; } - public constructor(private http: HttpService) {} + private http = inject(HttpService); public login(user: { username: string; password: string }): Promise { return this.http.post(`${this.authUrl}/login/`, user); diff --git a/client/src/app/gateways/http.service.ts b/client/src/app/gateways/http.service.ts index 056b1ab7fd..a41f61b956 100644 --- a/client/src/app/gateways/http.service.ts +++ b/client/src/app/gateways/http.service.ts @@ -1,5 +1,5 @@ import { HttpClient, HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http'; -import { Injectable, Injector } from '@angular/core'; +import { inject, Injectable, Injector } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom, Observable } from 'rxjs'; @@ -39,13 +39,11 @@ export class HttpService { return this._actionWorkerWatch; } - public constructor( - private http: HttpClient, - private errorMapper: ErrorMapService, - private injector: Injector, - private snackBar: MatSnackBar, - private translate: TranslateService - ) {} + private errorMapper = inject(ErrorMapService); + private http = inject(HttpClient); + private injector = inject(Injector); + private snackBar = inject(MatSnackBar); + private translate = inject(TranslateService); /** * Send the a http request the the given path. diff --git a/client/src/app/gateways/meeting-media-adapter.service.ts b/client/src/app/gateways/meeting-media-adapter.service.ts index 4e36f5b91f..296e6905a6 100644 --- a/client/src/app/gateways/meeting-media-adapter.service.ts +++ b/client/src/app/gateways/meeting-media-adapter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { Id } from '../domain/definitions/key-types'; import { ViewMediafile } from '../site/pages/meetings/pages/mediafiles'; @@ -13,7 +13,7 @@ type MediaAdapterActionParameters = ({ action: `set`; mediafile: ViewMediafile } providedIn: `root` }) export class MeetingMediaAdapterService { - public constructor(private actionService: ActionService) {} + private actionService = inject(ActionService); public setLogo(place: string, meetingId: Id, mediafile: ViewMediafile): Promise { return this.performAction(meetingId, { action: `set`, type: `logo`, place, mediafile }); diff --git a/client/src/app/gateways/presenter/get-user-editable-presenter.service.ts b/client/src/app/gateways/presenter/get-user-editable-presenter.service.ts index ba0674a739..a25278eb64 100644 --- a/client/src/app/gateways/presenter/get-user-editable-presenter.service.ts +++ b/client/src/app/gateways/presenter/get-user-editable-presenter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { Id } from 'src/app/domain/definitions/key-types'; import { Presenter } from './presenter'; @@ -17,7 +17,7 @@ export type GetUserEditablePresenterResult = Record { return await this.presenter.call(Presenter.GET_USER_EDITABLE, payload); diff --git a/client/src/app/gateways/repositories/users/user-repository.service.ts b/client/src/app/gateways/repositories/users/user-repository.service.ts index 14ec7413cc..7e99baad24 100644 --- a/client/src/app/gateways/repositories/users/user-repository.service.ts +++ b/client/src/app/gateways/repositories/users/user-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { Fqid } from 'src/app/domain/definitions/key-types'; import { MeetingUser } from 'src/app/domain/models/meeting-users/meeting-user'; import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; @@ -82,12 +82,11 @@ export type FullNameInformation = ShortNameInformation & LevelAndNumberInformati providedIn: `root` }) export class UserRepositoryService extends BaseRepository { - public constructor( - repositoryServiceCollector: RepositoryServiceCollectorService, - private activeMeetingIdService: ActiveMeetingIdService, - private meetingSettingsService: MeetingSettingsService, - private meetingUserRepo: MeetingUserRepositoryService - ) { + private activeMeetingIdService = inject(ActiveMeetingIdService); + private meetingSettingsService = inject(MeetingSettingsService); + private meetingUserRepo = inject(MeetingUserRepositoryService); + + public constructor(repositoryServiceCollector: RepositoryServiceCollectorService) { super(repositoryServiceCollector, User); } diff --git a/client/src/app/infrastructure/utils/import/json-import-file-utils.ts b/client/src/app/infrastructure/utils/import/json-import-file-utils.ts index ae90bbc91f..c8cea3cc84 100644 --- a/client/src/app/infrastructure/utils/import/json-import-file-utils.ts +++ b/client/src/app/infrastructure/utils/import/json-import-file-utils.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; @@ -10,16 +10,14 @@ export const WRONG_JSON_IMPORT_FORMAT_ERROR_MSG = _(`Import data needs to have t providedIn: `root` }) export class UploadFileJsonProcessorService { - public constructor( - private snackbar: MatSnackBar, - private translate: TranslateService - ) {} + private snackbar = inject(MatSnackBar); + private translate = inject(TranslateService); public async getUploadFileJson(file: FileData): Promise { const json = await new Promise(resolve => { const reader = new FileReader(); reader.addEventListener(`load`, progress => { - let result; + let result: any; try { result = JSON.parse(progress.target!.result as string); } catch (e) { diff --git a/client/src/app/openslides-main-module/components/openslides-main/openslides-main.component.ts b/client/src/app/openslides-main-module/components/openslides-main/openslides-main.component.ts index 697fafd0a6..b4b7b49316 100644 --- a/client/src/app/openslides-main-module/components/openslides-main/openslides-main.component.ts +++ b/client/src/app/openslides-main-module/components/openslides-main/openslides-main.component.ts @@ -1,4 +1,4 @@ -import { ApplicationRef, Component, DOCUMENT, Inject, OnInit, ViewContainerRef } from '@angular/core'; +import { ApplicationRef, Component, DOCUMENT, inject, OnInit, ViewContainerRef } from '@angular/core'; import { MatIconRegistry } from '@angular/material/icon'; import { DomSanitizer } from '@angular/platform-browser'; import { Router } from '@angular/router'; @@ -32,23 +32,21 @@ export class OpenSlidesMainComponent implements OnInit { public title = `OpenSlides`; - public constructor( - @Inject(DOCUMENT) private document: Document, - _viewContainer: ViewContainerRef, - _openslidesService: OpenSlidesService, - private appRef: ApplicationRef, - private lifecycleService: LifecycleService, - private domSanitizer: DomSanitizer, - private openslidesStatus: OpenSlidesStatusService, - private matIconRegistry: MatIconRegistry, - private translate: TranslateService, - private storageService: StorageService, - private config: DateFnsConfigurationService, - private updateService: UpdateService, - private router: Router, - private modelStore: ViewModelStoreService, - private ctService: CustomTranslationService - ) { + private document = inject(DOCUMENT); + private appRef = inject(ApplicationRef); + private lifecycleService = inject(LifecycleService); + private domSanitizer = inject(DomSanitizer); + private openslidesStatus = inject(OpenSlidesStatusService); + private matIconRegistry = inject(MatIconRegistry); + private translate = inject(TranslateService); + private storageService = inject(StorageService); + private config = inject(DateFnsConfigurationService); + private updateService = inject(UpdateService); + private router = inject(Router); + private modelStore = inject(ViewModelStoreService); + private ctService = inject(CustomTranslationService); + + public constructor(_viewContainer: ViewContainerRef, _openslidesService: OpenSlidesService) { overloadJsFunctions(); this.addDebugFunctions(); this.waitForAppLoaded(); diff --git a/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.ts b/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.ts index 74f80c99e7..c33975e728 100644 --- a/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.ts +++ b/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.ts @@ -6,14 +6,14 @@ import { HttpRequest, HttpResponse } from '@angular/common/http'; -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { Observable, tap } from 'rxjs'; import { AuthTokenService } from '../../site/services/auth-token.service'; @Injectable() export class AuthTokenInterceptor implements HttpInterceptor { - public constructor(private authTokenService: AuthTokenService) {} + private authTokenService = inject(AuthTokenService); public intercept(request: HttpRequest, next: HttpHandler): Observable> { if (this.authTokenService.rawAccessToken) { diff --git a/client/src/app/openslides-main-module/services/app-load.service.ts b/client/src/app/openslides-main-module/services/app-load.service.ts index a428945e78..1521dcf621 100644 --- a/client/src/app/openslides-main-module/services/app-load.service.ts +++ b/client/src/app/openslides-main-module/services/app-load.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Injector, Type } from '@angular/core'; +import { inject, Injectable, Injector, Type } from '@angular/core'; import { ActionWorkerAppConfig } from 'src/app/gateways/repositories/action-worker/action-worker.config'; import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; import { MeetingUserAppConfig } from 'src/app/gateways/repositories/meeting_user/meeting-user-config'; @@ -64,13 +64,13 @@ const appConfigs: AppConfig[] = [ providedIn: `root` }) export class AppLoadService { - public constructor( - private injector: Injector, - private modelMapper: CollectionMapperService, - private mainMenuService: MainMenuService, - private fallbackRoutesService: FallbackRoutesService - ) { - OpenSlidesInjector.setInjector(injector); + private injector = inject(Injector); + private modelMapper = inject(CollectionMapperService); + private mainMenuService = inject(MainMenuService); + private fallbackRoutesService = inject(FallbackRoutesService); + + public constructor() { + OpenSlidesInjector.setInjector(this.injector); } public async loadApps(): Promise { diff --git a/client/src/app/openslides-main-module/services/shared-worker.service.ts b/client/src/app/openslides-main-module/services/shared-worker.service.ts index c486ee0356..fd0c5f2bbe 100644 --- a/client/src/app/openslides-main-module/services/shared-worker.service.ts +++ b/client/src/app/openslides-main-module/services/shared-worker.service.ts @@ -1,4 +1,4 @@ -import { Injectable, NgZone } from '@angular/core'; +import { inject, Injectable, NgZone } from '@angular/core'; import { defer, filter, @@ -51,7 +51,9 @@ export class SharedWorkerService { private messageEventSubscription: Subscription; private windowMode = false; - public constructor(private zone: NgZone) { + private zone = inject(NgZone); + + public constructor() { this.connectWorker(true); } diff --git a/client/src/app/site/guards/auth.guard.ts b/client/src/app/site/guards/auth.guard.ts index 35a3d06a1d..39abdfd2d5 100644 --- a/client/src/app/site/guards/auth.guard.ts +++ b/client/src/app/site/guards/auth.guard.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router'; import { AuthCheckService } from '../services/auth-check.service'; @@ -18,12 +18,10 @@ enum CannotAccessReason { export class AuthGuard { private _cannotAccessReason: CannotAccessReason | null = null; - public constructor( - private reroute: RerouteService, - private osRouter: OpenSlidesRouterService, - private operator: OperatorService, - private authCheck: AuthCheckService - ) {} + private reroute = inject(RerouteService); + private osRouter = inject(OpenSlidesRouterService); + private operator = inject(OperatorService); + private authCheck = inject(AuthCheckService); /** * Checks of the operator has the required permission to see the state. diff --git a/client/src/app/site/guards/permission.guard.ts b/client/src/app/site/guards/permission.guard.ts index 5b5b0a3581..0761855b49 100644 --- a/client/src/app/site/guards/permission.guard.ts +++ b/client/src/app/site/guards/permission.guard.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { Route, Router, UrlSegment, UrlTree } from '@angular/router'; import { AuthCheckService } from '../services/auth-check.service'; @@ -9,12 +9,10 @@ import { RerouteService } from '../services/reroute.service'; providedIn: `root` }) export class PermissionGuard { - public constructor( - private router: Router, - private reroute: RerouteService, - private osRouter: OpenSlidesRouterService, - private authCheck: AuthCheckService - ) {} + private authCheck = inject(AuthCheckService); + private osRouter = inject(OpenSlidesRouterService); + private reroute = inject(RerouteService); + private router = inject(Router); public async canLoad(route: Route, segments: UrlSegment[]): Promise { const url = this.getCurrentNavigationUrl(); diff --git a/client/src/app/site/modules/chip-select/components/chip-select/chip-select.component.html b/client/src/app/site/modules/chip-select/components/chip-select/chip-select.component.html index 2c48dc2218..b1c6101110 100644 --- a/client/src/app/site/modules/chip-select/components/chip-select/chip-select.component.html +++ b/client/src/app/site/modules/chip-select/components/chip-select/chip-select.component.html @@ -1,11 +1,11 @@ @if (chips.length) { - + @for (chip of chips; track chip) { @@ -16,9 +16,9 @@ } @else { diff --git a/client/src/app/site/modules/chip-select/components/chip-select/chip-select.component.ts b/client/src/app/site/modules/chip-select/components/chip-select/chip-select.component.ts index 939fcbadc6..f42ae13355 100644 --- a/client/src/app/site/modules/chip-select/components/chip-select/chip-select.component.ts +++ b/client/src/app/site/modules/chip-select/components/chip-select/chip-select.component.ts @@ -1,4 +1,4 @@ -import { AfterContentInit, Component, ContentChildren, Input, QueryList } from '@angular/core'; +import { AfterContentInit, Component, ContentChildren, input, QueryList } from '@angular/core'; import { ChipSelectChipComponent } from '../chip-select-chip/chip-select-chip.component'; @@ -9,13 +9,9 @@ import { ChipSelectChipComponent } from '../chip-select-chip/chip-select-chip.co standalone: false }) export class ChipSelectComponent implements AfterContentInit { - public constructor() {} + public readonly chipClass = input(null); - @Input() - public chipClass: string | null; - - @Input() - public canOpen: boolean; + public readonly canOpen = input(false); @ContentChildren(ChipSelectChipComponent) public inputChips: QueryList; diff --git a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts index 18c2b5578a..1019681824 100644 --- a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts +++ b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, inject, OnInit, ViewChild } from '@angular/core'; import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; import { MatMenuTrigger } from '@angular/material/menu'; import { Router } from '@angular/router'; @@ -82,18 +82,17 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit { private clickCounter = 0; private clickTimeout: number | null = null; - public constructor( - private translate: TranslateService, - private operator: OperatorService, - private userRepo: UserControllerService, - private authService: AuthService, - private dialog: MatDialog, - private router: Router, - private theme: ThemeService, - private meetingSettingsService: MeetingSettingsService, - private activeMeetingIdService: ActiveMeetingIdService, - chessChallengeService: ChessChallengeService - ) { + private translate = inject(TranslateService); + private operator = inject(OperatorService); + private userRepo = inject(UserControllerService); + private authService = inject(AuthService); + private theme = inject(ThemeService); + private meetingSettingsService = inject(MeetingSettingsService); + private activeMeetingIdService = inject(ActiveMeetingIdService); + private dialog = inject(MatDialog); + private router = inject(Router); + + public constructor(chessChallengeService: ChessChallengeService) { super(); chessChallengeService.startListening(); } diff --git a/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.ts b/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.ts index 0a9021c897..bb9dc92fd1 100644 --- a/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.ts +++ b/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, inject, OnInit, ViewChild } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { TranslateService } from '@ngx-translate/core'; @@ -95,18 +95,14 @@ export class AccountDialogComponent extends BaseUiComponent implements OnInit { private _isUserInScope = false; private _isEditing = false; - public constructor( - public dialogRef: MatDialogRef, - private operator: OperatorService, - private repo: UserControllerService, - private meetingRepo: MeetingControllerService, - private userService: UserService, - private snackbar: MatSnackBar, - private authService: AuthService, - private translate: TranslateService - ) { - super(); - } + public dialogRef = inject(MatDialogRef); + private authService = inject(AuthService); + private meetingRepo = inject(MeetingControllerService); + private operator = inject(OperatorService); + private repo = inject(UserControllerService); + private snackbar = inject(MatSnackBar); + private translate = inject(TranslateService); + private userService = inject(UserService); public ngOnInit(): void { this.subscriptions.push( diff --git a/client/src/app/site/modules/global-headbar/components/global-search/global-search.component.ts b/client/src/app/site/modules/global-headbar/components/global-search/global-search.component.ts index 497376ac2d..054510e013 100644 --- a/client/src/app/site/modules/global-headbar/components/global-search/global-search.component.ts +++ b/client/src/app/site/modules/global-headbar/components/global-search/global-search.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnDestroy } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { _ } from '@ngx-translate/core'; import { pairwise, startWith, Subscription } from 'rxjs'; @@ -48,13 +48,6 @@ export class GlobalSearchComponent implements OnDestroy { public currentlyAvailableFilters = []; - public currentFilters = this.formBuilder.group({ - ...Object.fromEntries(Object.keys(this.availableFilters).map(field => [field, false])), - meetingFilter: this.activeMeeting.meetingId ? `current` : `all` - }); - - public inMeeting = !!this.activeMeeting.meetingId; - public get resultCount(): number { return this.results.length; } @@ -76,14 +69,23 @@ export class GlobalSearchComponent implements OnDestroy { private filterChangeSubscription: Subscription; private viewportSubscription: Subscription; - public constructor( - private activeMeeting: ActiveMeetingService, - public operator: OperatorService, - private globalSearchService: GlobalSearchService, - private formBuilder: FormBuilder, - private viewport: ViewPortService, - private cd: ChangeDetectorRef - ) { + public operator = inject(OperatorService); + private activeMeeting = inject(ActiveMeetingService); + private cd = inject(ChangeDetectorRef); + private formBuilder = inject(FormBuilder); + private globalSearchService = inject(GlobalSearchService); + private viewport = inject(ViewPortService); + + public get inMeeting(): boolean { + return !!this.activeMeeting.meetingId; + } + + public currentFilters = this.formBuilder.group({ + ...Object.fromEntries(Object.keys(this.availableFilters).map(field => [field, false])), + meetingFilter: this.activeMeeting.meetingId ? `current` : `all` + }); + + public constructor() { this.updateCurrentlyAvailableFilters(); this.filterChangeSubscription = this.currentFilters.valueChanges .pipe(startWith(this.currentFilters.value), pairwise()) diff --git a/client/src/app/site/pages/meetings/services/active-meeting.service.ts b/client/src/app/site/pages/meetings/services/active-meeting.service.ts index ae3ec361a4..4bfb217e6a 100644 --- a/client/src/app/site/pages/meetings/services/active-meeting.service.ts +++ b/client/src/app/site/pages/meetings/services/active-meeting.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, first, firstValueFrom, map, Observable, Subscription } from 'rxjs'; @@ -44,18 +44,18 @@ export class ActiveMeetingService { private _meetingSubject = new BehaviorSubject(null); private _meetingSubcription: Subscription | null = null; - public constructor( - private activeMeetingIdService: ActiveMeetingIdService, - private repo: MeetingControllerService, - private lifecycle: LifecycleService, - private bannerService: BannerService, - private archiveService: ArchiveStatusService, - private authService: AuthService, - private modelRequestService: ModelRequestService, - private router: Router, - private translate: TranslateService, - private meetingSettingsDefinitionService: MeetingSettingsDefinitionService - ) { + private activeMeetingIdService = inject(ActiveMeetingIdService); + private archiveService = inject(ArchiveStatusService); + private authService = inject(AuthService); + private bannerService = inject(BannerService); + private lifecycle = inject(LifecycleService); + private meetingSettingsDefinitionService = inject(MeetingSettingsDefinitionService); + private modelRequestService = inject(ModelRequestService); + private repo = inject(MeetingControllerService); + private router = inject(Router); + private translate = inject(TranslateService); + + public constructor() { this.activeMeetingIdService.meetingIdObservable.subscribe(id => { if (id !== undefined) { this.setupModelSubscription(); diff --git a/client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.ts b/client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.ts index c9f9671eb8..38f492fc56 100644 --- a/client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.ts +++ b/client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; import { Router } from '@angular/router'; @@ -34,10 +34,8 @@ export class MeetingComponentServiceCollectorService { return this.componentServiceCollector.router; } - public constructor( - private componentServiceCollector: ComponentServiceCollectorService, - public activeMeetingIdService: ActiveMeetingIdService, - public activeMeetingService: ActiveMeetingService, - public meetingSettingsService: MeetingSettingsService - ) {} + public activeMeetingIdService = inject(ActiveMeetingIdService); + public activeMeetingService = inject(ActiveMeetingService); + public meetingSettingsService = inject(MeetingSettingsService); + private componentServiceCollector = inject(ComponentServiceCollectorService); } diff --git a/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.ts b/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.ts index 739161432b..666eb51039 100644 --- a/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.ts +++ b/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { Subscription } from 'rxjs'; import { Collection, Id } from 'src/app/domain/definitions/key-types'; import { HasMeetingId, HasSequentialNumber, isSequentialNumberHaving } from 'src/app/domain/interfaces'; @@ -52,12 +52,11 @@ export class SequentialNumberMappingService { private _subscriptions: Subscription[] = []; private _repositories: BaseMeetingRelatedRepository[] = []; - public constructor( - collectionMapperService: MeetingCollectionMapperService, - private activeMeeting: ActiveMeetingService, - private autoupdateService: AutoupdateService, - private modelRequestBuilder: ModelRequestBuilderService - ) { + private activeMeeting = inject(ActiveMeetingService); + private autoupdateService = inject(AutoupdateService); + private modelRequestBuilder = inject(ModelRequestBuilderService); + + public constructor(collectionMapperService: MeetingCollectionMapperService) { collectionMapperService.getAllRepositoriesObservable().subscribe(repositories => { this._repositories = repositories; this.updateRepositoriesSubscriptions(); diff --git a/client/src/app/site/pages/organization/pages/committees/modules/committee-meeting-preview/committee-meeting-preview.component.ts b/client/src/app/site/pages/organization/pages/committees/modules/committee-meeting-preview/committee-meeting-preview.component.ts index a23605080d..d0081e86ae 100644 --- a/client/src/app/site/pages/organization/pages/committees/modules/committee-meeting-preview/committee-meeting-preview.component.ts +++ b/client/src/app/site/pages/organization/pages/committees/modules/committee-meeting-preview/committee-meeting-preview.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, inject, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; import { CML, OML } from 'src/app/domain/definitions/organization-permission'; @@ -76,13 +76,11 @@ export class CommitteeMeetingPreviewComponent implements OnDestroy, OnInit { private _canEditMeetingSetting = true; private _canEditMeetingSubscription: Subscription; - public constructor( - private translate: TranslateService, - private meetingRepo: MeetingControllerService, - private meetingService: MeetingService, - private promptService: PromptService, - public operator: OperatorService - ) {} + public operator = inject(OperatorService); + private meetingRepo = inject(MeetingControllerService); + private meetingService = inject(MeetingService); + private promptService = inject(PromptService); + private translate = inject(TranslateService); /** * Get the subject diff --git a/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.ts b/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.ts index 38a228a79e..8fe178e26a 100644 --- a/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { Router } from '@angular/router'; import { FileExportService } from 'src/app/gateways/export/file-export.service/file-export.service'; import { ExportMeetingPresenterService } from 'src/app/gateways/presenter/export-meeting-presenter.service'; @@ -10,12 +10,10 @@ import { AccountFilterService } from '../../../accounts/services/common/account- providedIn: 'root' }) export class MeetingService { - public constructor( - private router: Router, - private accountFilterService: AccountFilterService, - private exporter: FileExportService, - private exportMeetingPresenter: ExportMeetingPresenterService - ) {} + private router = inject(Router); + private accountFilterService = inject(AccountFilterService); + private exporter = inject(FileExportService); + private exportMeetingPresenter = inject(ExportMeetingPresenterService); public async navigateToMeetingUsers(meeting: ViewMeeting): Promise { await this.router.navigate([`accounts`, `meeting`, meeting.id]); diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/components/committee-import-list/committee-import-list.component.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/components/committee-import-list/committee-import-list.component.ts index 4c88ef9062..e161849ac2 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/components/committee-import-list/committee-import-list.component.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/components/committee-import-list/committee-import-list.component.ts @@ -1,5 +1,4 @@ import { Component } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; import { BaseViaBackendImportListComponent } from 'src/app/site/base/base-via-backend-import-list.component'; import { committeeHeadersAndVerboseNames } from 'src/app/site/pages/organization/pages/committees/pages/committee-import/definitions'; import { ImportListHeaderDefinition } from 'src/app/ui/modules/import-list'; @@ -32,10 +31,7 @@ export class CommitteeImportListComponent extends BaseViaBackendImportListCompon is_list: [`forward_to_committees`, `organization_tags`, `managers`, `meeting_admins`].includes(header) })); - public constructor( - protected override translate: TranslateService, - public override importer: CommitteeImportService - ) { + public constructor(public override importer: CommitteeImportService) { super(importer); } } diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts index 63cd1426e6..5346e40282 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { _ } from '@ngx-translate/core'; import { CsvExportForBackendService } from 'src/app/gateways/export/csv-export.service/csv-export-for-backend.service'; import { BaseBackendImportService } from 'src/app/site/base/base-import.service/base-backend-import.service'; @@ -27,11 +27,10 @@ export class CommitteeImportService extends BaseBackendImportService { warning: _(`Committees with warnings: affected cells will be skipped`) }; - public constructor( - importServiceCollector: ImportServiceCollectorService, - private exporter: CsvExportForBackendService, - private repo: CommitteeControllerService - ) { + private exporter = inject(CsvExportForBackendService); + private repo = inject(CommitteeControllerService); + + public constructor(importServiceCollector: ImportServiceCollectorService) { super(importServiceCollector); } diff --git a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.ts b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.ts index 31276e66a1..38c5f2e6a3 100644 --- a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.ts +++ b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, signal } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { _ } from '@ngx-translate/core'; import { availableTranslations } from 'src/app/domain/definitions/languages'; @@ -43,7 +43,6 @@ export class OrganizationSettingsComponent extends BaseComponent { private controller = inject(OrganizationControllerService); private operator = inject(OperatorService); private timeZone = inject(TimeZoneService); - private cd = inject(ChangeDetectorRef); public constructor() { super(); diff --git a/client/src/app/ui/directives/autofocus/autofocus.directive.ts b/client/src/app/ui/directives/autofocus/autofocus.directive.ts index 7d6a8923f9..73c18d5e3c 100644 --- a/client/src/app/ui/directives/autofocus/autofocus.directive.ts +++ b/client/src/app/ui/directives/autofocus/autofocus.directive.ts @@ -1,17 +1,11 @@ -import { Directive, ElementRef, OnInit } from '@angular/core'; +import { Directive, ElementRef, inject, OnInit } from '@angular/core'; @Directive({ selector: `[osAutofocus]`, standalone: false }) export class AutofocusDirective implements OnInit { - /** - * Constructor - * - * Gets the reference of the annotated element - * @param el ElementRef - */ - public constructor(private el: ElementRef) {} + private el = inject(ElementRef); /** * Executed after page init, calls the focus function after an unnoticeable timeout diff --git a/client/src/app/ui/directives/meeting-setting/meeting-setting.directive.ts b/client/src/app/ui/directives/meeting-setting/meeting-setting.directive.ts index 9c3dc3014a..70b777cbae 100644 --- a/client/src/app/ui/directives/meeting-setting/meeting-setting.directive.ts +++ b/client/src/app/ui/directives/meeting-setting/meeting-setting.directive.ts @@ -1,4 +1,4 @@ -import { Directive, EmbeddedViewRef, Input, TemplateRef, ViewContainerRef } from '@angular/core'; +import { Directive, EmbeddedViewRef, inject, Input, TemplateRef, ViewContainerRef } from '@angular/core'; import { Settings } from 'src/app/domain/models/meetings/meeting'; import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; @@ -57,11 +57,10 @@ export class MeetingSettingDirective extends BaseUiComponent { private _elseTemplate: TemplateRef | null = null; private _elseViewRef: EmbeddedViewRef | null = null; - public constructor( - template: TemplateRef, - private viewContainer: ViewContainerRef, - private meetingSettingsService: MeetingSettingsService - ) { + private viewContainer = inject(ViewContainerRef); + private meetingSettingsService = inject(MeetingSettingsService); + + public constructor(template: TemplateRef) { super(); this._thenTemplate = template; } diff --git a/client/src/app/ui/directives/paper/paper.directive.ts b/client/src/app/ui/directives/paper/paper.directive.ts index d128b73da2..df4b9d1223 100644 --- a/client/src/app/ui/directives/paper/paper.directive.ts +++ b/client/src/app/ui/directives/paper/paper.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, Input, OnInit } from '@angular/core'; +import { Directive, ElementRef, inject, Input, OnInit } from '@angular/core'; const DEPTH_0 = 0; const DEPTH_0_VALUE = `none`; @@ -38,7 +38,7 @@ export class PaperDirective implements OnInit { [DEPTH_5]: DEPTH_5_VALUE }; - public constructor(private container: ElementRef) {} + private container = inject(ElementRef); public ngOnInit(): void { if (!this.depthMap[this.osPaper]) { diff --git a/client/src/app/ui/directives/resized/resized.directive.ts b/client/src/app/ui/directives/resized/resized.directive.ts index 099ab7d724..781ae8a8bb 100644 --- a/client/src/app/ui/directives/resized/resized.directive.ts +++ b/client/src/app/ui/directives/resized/resized.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, EventEmitter, OnInit, Output } from '@angular/core'; +import { Directive, ElementRef, EventEmitter, inject, OnInit, Output } from '@angular/core'; export interface ElementSize { height: number; @@ -26,7 +26,7 @@ export class ResizedDirective implements OnInit { */ private oldHeight: number | null = null; - public constructor(private element: ElementRef) {} + private element = inject(ElementRef); /** * Inits the ResizeSensor. triggers initial size change. diff --git a/client/src/app/ui/directives/trim-on-paste/trim-on-paste.directive.ts b/client/src/app/ui/directives/trim-on-paste/trim-on-paste.directive.ts index 9c3ba564b3..0b88d0b54f 100644 --- a/client/src/app/ui/directives/trim-on-paste/trim-on-paste.directive.ts +++ b/client/src/app/ui/directives/trim-on-paste/trim-on-paste.directive.ts @@ -1,11 +1,11 @@ -import { Directive, ElementRef, HostListener } from '@angular/core'; +import { Directive, ElementRef, HostListener, inject } from '@angular/core'; @Directive({ selector: `[osTrimOnPaste]`, standalone: false }) export class TrimOnPasteDirective { - public constructor(private el: ElementRef) {} + private el = inject(ElementRef); @HostListener(`paste`, [`$event`]) public onPaste(event: ClipboardEvent): void { const clipboardData = event.clipboardData; diff --git a/client/src/app/ui/modules/chip/chip.component.ts b/client/src/app/ui/modules/chip/chip.component.ts index 18f32ff43c..baa33a43eb 100644 --- a/client/src/app/ui/modules/chip/chip.component.ts +++ b/client/src/app/ui/modules/chip/chip.component.ts @@ -1,5 +1,5 @@ import { CommonModule } from '@angular/common'; -import { Component, ElementRef, Input } from '@angular/core'; +import { Component, ElementRef, inject, Input } from '@angular/core'; import { MatChipsModule } from '@angular/material/chips'; import { MatRippleModule } from '@angular/material/core'; import { HtmlColor } from 'src/app/domain/definitions/key-types'; @@ -31,12 +31,10 @@ export class ChipComponent { private _color: Color | null = null; private _threshold = `0.5`; - private root = this.hostElement.nativeElement; + private hostElement = inject(ElementRef); + private colorService = inject(ColorService); - public constructor( - private hostElement: ElementRef, - private colorService: ColorService - ) {} + private root = this.hostElement.nativeElement; private recalcForegroundColor(): void { this.root.style.setProperty(`--os-chip-red`, this._color!.red); diff --git a/client/src/app/ui/modules/choice-dialog/services/choice.service.ts b/client/src/app/ui/modules/choice-dialog/services/choice.service.ts index 2595c10045..8bbda6feec 100644 --- a/client/src/app/ui/modules/choice-dialog/services/choice.service.ts +++ b/client/src/app/ui/modules/choice-dialog/services/choice.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { firstValueFrom, Observable } from 'rxjs'; import { Selectable } from 'src/app/domain/interfaces'; @@ -9,7 +9,7 @@ import { ChoiceAnswer, ChoiceDialogConfig } from '../definitions'; @Injectable({ providedIn: `root` }) export class ChoiceService { - public constructor(private dialog: MatDialog) {} + private dialog = inject(MatDialog); /** * Opens the dialog. Returns the chosen value after the user accepts. diff --git a/client/src/app/ui/modules/comma-separated-listing/comma-separated-listing.component.ts b/client/src/app/ui/modules/comma-separated-listing/comma-separated-listing.component.ts index d6e836d563..0ebb659f93 100644 --- a/client/src/app/ui/modules/comma-separated-listing/comma-separated-listing.component.ts +++ b/client/src/app/ui/modules/comma-separated-listing/comma-separated-listing.component.ts @@ -33,6 +33,4 @@ export class CommaSeparatedListingComponent { public get shortenedList(): T[] { return this.ellipsed ? this.list.slice(0, this.showElementsAmount) : this.list; } - - public constructor() {} } diff --git a/client/src/app/ui/modules/editor/components/editor-image-dialog/editor-image-dialog.component.ts b/client/src/app/ui/modules/editor/components/editor-image-dialog/editor-image-dialog.component.ts index 8490af4e2e..f58c16d7cb 100644 --- a/client/src/app/ui/modules/editor/components/editor-image-dialog/editor-image-dialog.component.ts +++ b/client/src/app/ui/modules/editor/components/editor-image-dialog/editor-image-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject } from '@angular/core'; +import { Component, Inject, inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; interface EditorImageData { @@ -25,10 +25,9 @@ export interface EditorImageDialogOutput { export class EditorImageDialogComponent { public image: EditorImageData; - public constructor( - @Inject(MAT_DIALOG_DATA) public data: EditorImageDialogInput, - private dialogRef: MatDialogRef - ) { + private dialogRef = inject(MatDialogRef); + + public constructor(@Inject(MAT_DIALOG_DATA) public data: EditorImageDialogInput) { this.image = data.image; } diff --git a/client/src/app/ui/modules/editor/components/editor/editor.component.ts b/client/src/app/ui/modules/editor/components/editor/editor.component.ts index 4179744f01..0a3187fa70 100644 --- a/client/src/app/ui/modules/editor/components/editor/editor.component.ts +++ b/client/src/app/ui/modules/editor/components/editor/editor.component.ts @@ -165,10 +165,6 @@ export class EditorComponent extends BaseFormControlComponent implements private domParser = new DOMParser(); - public constructor() { - super(); - } - public ngAfterViewInit(): void { const editorConfig = { element: this.editorEl.nativeElement, diff --git a/client/src/app/ui/modules/editor/directives/tab-navigation.directive.ts b/client/src/app/ui/modules/editor/directives/tab-navigation.directive.ts index d932c3078a..3a3d130c3b 100644 --- a/client/src/app/ui/modules/editor/directives/tab-navigation.directive.ts +++ b/client/src/app/ui/modules/editor/directives/tab-navigation.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, HostListener, Input, QueryList } from '@angular/core'; +import { Directive, ElementRef, HostListener, inject, Input, QueryList } from '@angular/core'; @Directive({ selector: `[osArrowNavigation]`, @@ -126,7 +126,7 @@ export class ArrowNavigationDirective { firstButton.nativeElement.tabIndex = 0; } - public constructor(private button: ElementRef) {} + private button = inject(ElementRef); private findButtonIndex(): number { return this.buttonList diff --git a/client/src/app/ui/modules/expandable-content-wrapper/expandable-content-wrapper.component.ts b/client/src/app/ui/modules/expandable-content-wrapper/expandable-content-wrapper.component.ts index eb5c7934e9..c4657bae7a 100644 --- a/client/src/app/ui/modules/expandable-content-wrapper/expandable-content-wrapper.component.ts +++ b/client/src/app/ui/modules/expandable-content-wrapper/expandable-content-wrapper.component.ts @@ -1,5 +1,5 @@ import { CommonModule } from '@angular/common'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input } from '@angular/core'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from '../../directives'; @@ -72,7 +72,9 @@ export class ExpandableContentWrapperComponent { public _biggerHeight = false; - public constructor(private cd: ChangeDetectorRef) { + private cd = inject(ChangeDetectorRef); + + public constructor() { this.isCollapsed = false; this.update(); } diff --git a/client/src/app/ui/modules/file-list/file-list.component.ts b/client/src/app/ui/modules/file-list/file-list.component.ts index a4dc96af7f..6481d4d541 100644 --- a/client/src/app/ui/modules/file-list/file-list.component.ts +++ b/client/src/app/ui/modules/file-list/file-list.component.ts @@ -4,6 +4,7 @@ import { ChangeDetectorRef, Component, EventEmitter, + inject, Input, OnDestroy, OnInit, @@ -238,17 +239,17 @@ export class FileListComponent extends BaseUiComponent implements OnInit, OnDest private readonly _directoryBehaviorSubject = new BehaviorSubject([]); - public constructor( - private dialog: MatDialog, - private cd: ChangeDetectorRef, - private fb: UntypedFormBuilder, - private translate: TranslateService, - private repo: MediafileControllerService, - private activeMeeting: ActiveMeetingService, - private promptService: PromptService - ) { + private activeMeeting = inject(ActiveMeetingService); + private cd = inject(ChangeDetectorRef); + private dialog = inject(MatDialog); + private fb = inject(UntypedFormBuilder); + private promptService = inject(PromptService); + private repo = inject(MediafileControllerService); + private translate = inject(TranslateService); + + public constructor() { super(); - this.moveForm = fb.group({ directory_id: [] }); + this.moveForm = this.fb.group({ directory_id: [] }); this.subscriptions.push( this.moveForm.get(`directory_id`).valueChanges.subscribe(id => { this.movingToPublicFolder = id && this.repo.getViewModel(id).isPublishedOrganizationWide; diff --git a/client/src/app/ui/modules/head-bar/components/head-bar/head-bar.component.ts b/client/src/app/ui/modules/head-bar/components/head-bar/head-bar.component.ts index 490d898771..f7ae2d95d2 100644 --- a/client/src/app/ui/modules/head-bar/components/head-bar/head-bar.component.ts +++ b/client/src/app/ui/modules/head-bar/components/head-bar/head-bar.component.ts @@ -3,6 +3,7 @@ import { AfterViewInit, Component, EventEmitter, + inject, Input, OnInit, Output, @@ -206,18 +207,13 @@ export class HeadBarComponent implements OnInit, AfterViewInit { private _isSavingSubject = new BehaviorSubject(false); private _isSaveButtonEnabled = true; - /** - * Empty constructor - */ - public constructor( - public vp: ViewPortService, - private menu: MainMenuService, - private router: Router, - private route: ActivatedRoute, - private routingState: RoutingStateService, - private headbarService: GlobalHeadbarService, - private _viewContainerRef: ViewContainerRef - ) {} + public vp = inject(ViewPortService); + private headbarService = inject(GlobalHeadbarService); + private menu = inject(MainMenuService); + private route = inject(ActivatedRoute); + private router = inject(Router); + private routingState = inject(RoutingStateService); + private _viewContainerRef = inject(ViewContainerRef); /** * Detect if the cancel edit event was used diff --git a/client/src/app/ui/modules/head-bar/services/routing-state.service.ts b/client/src/app/ui/modules/head-bar/services/routing-state.service.ts index cde686bf4e..7132d33f01 100644 --- a/client/src/app/ui/modules/head-bar/services/routing-state.service.ts +++ b/client/src/app/ui/modules/head-bar/services/routing-state.service.ts @@ -1,5 +1,5 @@ import { Location } from '@angular/common'; -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { Router, RoutesRecognized } from '@angular/router'; import { filter, pairwise, startWith } from 'rxjs'; @@ -48,6 +48,9 @@ export class RoutingStateService { return this._customOrigin; } + private router = inject(Router); + private location = inject(Location); + private _currentUrl: string = this.location.path(); /** @@ -55,10 +58,7 @@ export class RoutingStateService { * * @param router Angular Router */ - public constructor( - private router: Router, - private location: Location - ) { + public constructor() { this.router.events .pipe( filter(e => e instanceof RoutesRecognized), @@ -67,9 +67,10 @@ export class RoutingStateService { ) .subscribe((event: any[]) => { this.skipUnsafeRouteCheck = - router.currentNavigation()?.extras?.state && router.currentNavigation()?.extras?.state[`canGoBack`]; + this.router.currentNavigation()?.extras?.state && + this.router.currentNavigation()?.extras?.state[`canGoBack`]; this._previousUrl = event[0]?.urlAfterRedirects ?? this._currentUrl; - const currentNavigationExtras = router.currentNavigation()?.extras; + const currentNavigationExtras = this.router.currentNavigation()?.extras; if (currentNavigationExtras && currentNavigationExtras.state && currentNavigationExtras.state[`back`]) { this._customOrigin = this._previousUrl; } else if ( diff --git a/client/src/app/ui/modules/head-toolbar/head-toolbar.component.ts b/client/src/app/ui/modules/head-toolbar/head-toolbar.component.ts index 236ed00de8..dc22c53fe7 100644 --- a/client/src/app/ui/modules/head-toolbar/head-toolbar.component.ts +++ b/client/src/app/ui/modules/head-toolbar/head-toolbar.component.ts @@ -2,6 +2,7 @@ import { TemplatePortal } from '@angular/cdk/portal'; import { AfterViewInit, Component, + inject, OnDestroy, TemplateRef, ViewChild, @@ -28,13 +29,8 @@ import { GlobalHeadbarService } from 'src/app/site/modules/global-headbar/global export class HeadToolbarComponent implements AfterViewInit, OnDestroy { @ViewChild(`toolbarContent`) public toolbarContent: TemplateRef; - /** - * Empty constructor - */ - public constructor( - private headbarService: GlobalHeadbarService, - private _viewContainerRef: ViewContainerRef - ) {} + private headbarService = inject(GlobalHeadbarService); + private _viewContainerRef = inject(ViewContainerRef); public ngAfterViewInit(): void { this.headbarService.additionalHeadbar = new TemplatePortal(this.toolbarContent, this._viewContainerRef); diff --git a/client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts b/client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts index 030322e626..2e44e90c9f 100644 --- a/client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts +++ b/client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts @@ -4,6 +4,7 @@ import { ContentChildren, ElementRef, EventEmitter, + inject, Input, OnDestroy, OnInit, @@ -242,10 +243,8 @@ export class BackendImportListComponent implements OnInit, OnDestroy { private _headers: Record = {}; - public constructor( - private dialog: MatDialog, - private translate: TranslateService - ) {} + private dialog = inject(MatDialog); + private translate = inject(TranslateService); /** * Starts with a clean preview (removing any previously existing import previews) diff --git a/client/src/app/ui/modules/import-list/directives/import-list-first-tab.directive.ts b/client/src/app/ui/modules/import-list/directives/import-list-first-tab.directive.ts index 5bfcb8ae08..476ef29f41 100644 --- a/client/src/app/ui/modules/import-list/directives/import-list-first-tab.directive.ts +++ b/client/src/app/ui/modules/import-list/directives/import-list-first-tab.directive.ts @@ -1,4 +1,4 @@ -import { Directive, Input, TemplateRef } from '@angular/core'; +import { Directive, inject, Input, TemplateRef } from '@angular/core'; @Directive({ selector: `[osImportListFirstTab]`, @@ -8,5 +8,5 @@ export class ImportListFirstTabDirective { @Input() public label: string; - public constructor(public templateRef: TemplateRef) {} + public templateRef = inject(TemplateRef); } diff --git a/client/src/app/ui/modules/import-list/directives/import-list-last-tab.directive.ts b/client/src/app/ui/modules/import-list/directives/import-list-last-tab.directive.ts index c2a49e49aa..ed74b8a83a 100644 --- a/client/src/app/ui/modules/import-list/directives/import-list-last-tab.directive.ts +++ b/client/src/app/ui/modules/import-list/directives/import-list-last-tab.directive.ts @@ -1,4 +1,4 @@ -import { Directive, Input, TemplateRef } from '@angular/core'; +import { Directive, inject, Input, TemplateRef } from '@angular/core'; @Directive({ selector: `[osImportListLastTab]`, @@ -8,5 +8,5 @@ export class ImportListLastTabDirective { @Input() public label: string; - public constructor(public templateRef: TemplateRef) {} + public templateRef = inject(TemplateRef); } diff --git a/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.ts b/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.ts index a53bdfcd9b..1f8304cfca 100644 --- a/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.ts +++ b/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.ts @@ -2,6 +2,7 @@ import { ChangeDetectionStrategy, Component, EventEmitter, + inject, Input, OnInit, Output, @@ -58,7 +59,7 @@ export class FilterMenuComponent implements OnInit { @Input() public showSpacer = false; - public constructor(private cd: ChangeDetectorRef) {} + private cd = inject(ChangeDetectorRef); /** * Directly closes again if no sorting is available diff --git a/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.ts b/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.ts index 4896b58067..00df1371ba 100644 --- a/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.ts +++ b/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.ts @@ -3,6 +3,7 @@ import { Component, EventEmitter, HostListener, + inject, Input, OnDestroy, OnInit, @@ -200,11 +201,9 @@ export class SortFilterBarComponent implements OnDestroy private mobileSubscription: Subscription | null; - public constructor( - protected translate: TranslateService, - public vp: ViewPortService, - private bottomSheet: MatBottomSheet - ) {} + public vp = inject(ViewPortService); + protected translate = inject(TranslateService); + private bottomSheet = inject(MatBottomSheet); public ngOnInit(): void { this.mobileSubscription = this.vp.isMobileSubject.subscribe(v => { diff --git a/client/src/app/ui/modules/media-upload-content/media-upload-content.component.ts b/client/src/app/ui/modules/media-upload-content/media-upload-content.component.ts index b21a6a4b3e..2acfe9a862 100644 --- a/client/src/app/ui/modules/media-upload-content/media-upload-content.component.ts +++ b/client/src/app/ui/modules/media-upload-content/media-upload-content.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, inject, Input, OnInit, Output } from '@angular/core'; import { FormsModule, ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; @@ -80,9 +80,7 @@ export class MediaUploadContentComponent extends BaseUiComponent implements OnIn public directorySelectionForm: UntypedFormGroup; - public constructor(private formBuilder: UntypedFormBuilder) { - super(); - } + private formBuilder = inject(UntypedFormBuilder); /** * Init diff --git a/client/src/app/ui/modules/meeting-time/meeting-time.component.ts b/client/src/app/ui/modules/meeting-time/meeting-time.component.ts index e44b417003..48413eeed0 100644 --- a/client/src/app/ui/modules/meeting-time/meeting-time.component.ts +++ b/client/src/app/ui/modules/meeting-time/meeting-time.component.ts @@ -1,5 +1,5 @@ import { CommonModule } from '@angular/common'; -import { Component, Input } from '@angular/core'; +import { Component, inject, Input } from '@angular/core'; import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; import { TimeZoneService } from 'src/app/site/services/time-zone.service'; @@ -12,7 +12,7 @@ import { PipesModule } from '../../pipes'; imports: [CommonModule, PipesModule] }) export class MeetingTimeComponent { - public constructor(public timeZoneService: TimeZoneService) {} + public timeZoneService = inject(TimeZoneService); @Input() public meeting?: ViewMeeting; diff --git a/client/src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.ts b/client/src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.ts index b620ac12f3..19339f489e 100644 --- a/client/src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.ts +++ b/client/src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.ts @@ -1,4 +1,4 @@ -import { Inject, Injectable, Optional } from '@angular/core'; +import { Inject, inject, Injectable, Optional } from '@angular/core'; import { MAT_DATE_LOCALE } from '@angular/material/core'; import { DateFnsAdapter } from '@angular/material-date-fns-adapter'; import { TranslateService } from '@ngx-translate/core'; @@ -10,16 +10,15 @@ import { langToTimeLocale } from 'src/app/infrastructure/utils'; */ @Injectable() export class OpenSlidesDateAdapter extends DateFnsAdapter { - public constructor( - protected translate: TranslateService, - @Optional() @Inject(MAT_DATE_LOCALE) dateLocale: string - ) { + private translate = inject(TranslateService); + + public constructor(@Optional() @Inject(MAT_DATE_LOCALE) dateLocale: string) { super(dateLocale); // subscribe to language changes to change localisation of dates accordingly // DateAdapter seems not to be a singleton so we do that in this subclass instead of app.component - this.updateLocaleByName(translate.getCurrentLang()); - translate.onLangChange.subscribe(() => { - this.updateLocaleByName(translate.getCurrentLang()); + this.updateLocaleByName(this.translate.getCurrentLang()); + this.translate.onLangChange.subscribe(() => { + this.updateLocaleByName(this.translate.getCurrentLang()); }); } diff --git a/client/src/app/ui/modules/prompt-checkbox/prompt-checkbox.component.ts b/client/src/app/ui/modules/prompt-checkbox/prompt-checkbox.component.ts index eefafe2068..4949dc89e0 100644 --- a/client/src/app/ui/modules/prompt-checkbox/prompt-checkbox.component.ts +++ b/client/src/app/ui/modules/prompt-checkbox/prompt-checkbox.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component, EventEmitter, inject, Input, Output } from '@angular/core'; import { MAT_CHECKBOX_DEFAULT_OPTIONS, MatCheckboxDefaultOptions, MatCheckboxModule } from '@angular/material/checkbox'; import { PromptService } from '../prompt-dialog'; @@ -34,7 +34,7 @@ export class PromptCheckboxComponent { */ @Output() public selected = new EventEmitter(); - public constructor(public prompt: PromptService) {} + public prompt = inject(PromptService); public async openPrompt(): Promise { if (!this.disabled) { diff --git a/client/src/app/ui/modules/prompt-dialog/services/prompt.service.ts b/client/src/app/ui/modules/prompt-dialog/services/prompt.service.ts index 9a8c6ba826..2de141347f 100644 --- a/client/src/app/ui/modules/prompt-dialog/services/prompt.service.ts +++ b/client/src/app/ui/modules/prompt-dialog/services/prompt.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom } from 'rxjs'; @@ -11,10 +11,8 @@ import { PromptDialogComponent } from '../prompt-dialog.component'; export class PromptService { private dialogRef: MatDialogRef | null = null; - public constructor( - private dialog: MatDialog, - private translate: TranslateService - ) {} + private dialog = inject(MatDialog); + private translate = inject(TranslateService); /** * Opens the dialog. Returns true, if the user accepts. diff --git a/client/src/app/ui/modules/qr-code/qr-code.component.ts b/client/src/app/ui/modules/qr-code/qr-code.component.ts index 96259795b5..3c83f90f70 100644 --- a/client/src/app/ui/modules/qr-code/qr-code.component.ts +++ b/client/src/app/ui/modules/qr-code/qr-code.component.ts @@ -21,8 +21,6 @@ export class QrCodeComponent implements AfterViewInit { private _textSubject = new BehaviorSubject(``); - public constructor() {} - public ngAfterViewInit(): void { this._textSubject.pipe(distinctUntilChanged()).subscribe(text => this.createCanvas(text)); } diff --git a/client/src/app/ui/modules/scrolling-table/components/scrolling-table/scrolling-table.component.ts b/client/src/app/ui/modules/scrolling-table/components/scrolling-table/scrolling-table.component.ts index 785cc5b53e..59f2dafa0c 100644 --- a/client/src/app/ui/modules/scrolling-table/components/scrolling-table/scrolling-table.component.ts +++ b/client/src/app/ui/modules/scrolling-table/components/scrolling-table/scrolling-table.component.ts @@ -1,6 +1,6 @@ import { TemplatePortal } from '@angular/cdk/portal'; import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; -import { AfterViewInit, Component, ElementRef, Input, OnInit, Output, ViewChild } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, inject, Input, OnInit, Output, ViewChild } from '@angular/core'; import { ChangeDetectorRef, EventEmitter, HostListener, OnDestroy } from '@angular/core'; import { BehaviorSubject, map, Observable } from 'rxjs'; import { Identifiable } from 'src/app/domain/interfaces'; @@ -142,12 +142,8 @@ export class ScrollingTableComponent>> private _oldDistTop = 0; - public constructor( - private manageService: ScrollingTableManageService, - private cd: ChangeDetectorRef - ) { - super(); - } + private manageService = inject(ScrollingTableManageService); + private cd = inject(ChangeDetectorRef); public ngOnInit(): void { this.manageService.currentScrollingTableComponent = this; diff --git a/client/src/app/ui/modules/scrolling-table/directives/scrolling-table-no-data.directive.ts b/client/src/app/ui/modules/scrolling-table/directives/scrolling-table-no-data.directive.ts index 98510a806c..e5c5b3125b 100644 --- a/client/src/app/ui/modules/scrolling-table/directives/scrolling-table-no-data.directive.ts +++ b/client/src/app/ui/modules/scrolling-table/directives/scrolling-table-no-data.directive.ts @@ -1,5 +1,5 @@ import { CdkPortal } from '@angular/cdk/portal'; -import { Directive, OnInit, TemplateRef, ViewContainerRef } from '@angular/core'; +import { Directive, inject, OnInit, TemplateRef, ViewContainerRef } from '@angular/core'; import { ScrollingTableManageService } from '../services'; @@ -8,11 +8,9 @@ import { ScrollingTableManageService } from '../services'; standalone: false }) export class ScrollingTableNoDataDirective extends CdkPortal implements OnInit { - public constructor( - template: TemplateRef, - viewContainer: ViewContainerRef, - private manageService: ScrollingTableManageService - ) { + private manageService = inject(ScrollingTableManageService); + + public constructor(template: TemplateRef, viewContainer: ViewContainerRef) { super(template, viewContainer); } diff --git a/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts b/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts index 36fa62e1c4..d7794bb788 100644 --- a/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts +++ b/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnDestroy, OnInit, Optional, Self, ViewEncapsulation } from '@angular/core'; +import { Component, inject, Input, OnDestroy, OnInit, Optional, Self, ViewEncapsulation } from '@angular/core'; import { NgControl } from '@angular/forms'; import { MatFormFieldControl } from '@angular/material/form-field'; import { map, OperatorFunction } from 'rxjs'; @@ -45,11 +45,10 @@ export class RepoSearchSelectorComponent extends BaseSearchSelectorComponent imp private subscriptionName: string; - public constructor( - @Optional() @Self() ngControl: NgControl, - private meetingSettingsService: MeetingSettingsService, - private modelRequestService: ModelRequestService - ) { + private meetingSettingsService = inject(MeetingSettingsService); + private modelRequestService = inject(ModelRequestService); + + public constructor(@Optional() @Self() ngControl: NgControl) { super(ngControl); this.shouldPropagateOnRegistering = false; } diff --git a/client/src/app/ui/modules/sidenav/components/copyright-sign/copyright-sign.component.ts b/client/src/app/ui/modules/sidenav/components/copyright-sign/copyright-sign.component.ts index a0993296ee..89f32849b7 100644 --- a/client/src/app/ui/modules/sidenav/components/copyright-sign/copyright-sign.component.ts +++ b/client/src/app/ui/modules/sidenav/components/copyright-sign/copyright-sign.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component, inject } from '@angular/core'; import { EasterEggContentPlatformService } from '../../modules/easter-egg/services/easter-egg-content-platform.service'; @@ -12,7 +12,7 @@ export class CopyrightSignComponent { private clickTimeout: number | null = null; private clickCounter = 0; - public constructor(private dialog: EasterEggContentPlatformService) {} + private dialog = inject(EasterEggContentPlatformService); public launchC4(event: Event): void { event.stopPropagation(); diff --git a/client/src/app/ui/modules/sidenav/components/image/image.component.ts b/client/src/app/ui/modules/sidenav/components/image/image.component.ts index 0763808d78..a5d5ae91b0 100644 --- a/client/src/app/ui/modules/sidenav/components/image/image.component.ts +++ b/client/src/app/ui/modules/sidenav/components/image/image.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, inject, Input } from '@angular/core'; import { HttpService } from 'src/app/gateways/http.service'; @Component({ @@ -39,7 +39,7 @@ export class ImageComponent { private _source: string | null = null; - public constructor(private http: HttpService) {} // Maybe the wrong place here! + private http = inject(HttpService); private onChange(): void { this.loaded = false; diff --git a/client/src/app/ui/modules/sidenav/components/logo/logo.component.ts b/client/src/app/ui/modules/sidenav/components/logo/logo.component.ts index 82a3e638c4..d814c5af87 100644 --- a/client/src/app/ui/modules/sidenav/components/logo/logo.component.ts +++ b/client/src/app/ui/modules/sidenav/components/logo/logo.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, inject, Input, OnInit } from '@angular/core'; import { MediaManageService } from 'src/app/site/pages/meetings/services/media-manage.service'; import { ThemeService } from 'src/app/site/services/theme.service'; import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; @@ -38,12 +38,8 @@ export class LogoComponent extends BaseUiComponent implements OnInit { private _path: string | null = null; private _isDarkMode = false; - public constructor( - private themeService: ThemeService, - private mediaManageService: MediaManageService - ) { - super(); - } + private themeService = inject(ThemeService); + private mediaManageService = inject(MediaManageService); public ngOnInit(): void { this.subscriptions.push( diff --git a/client/src/app/ui/modules/sidenav/components/sidenav/sidenav.component.ts b/client/src/app/ui/modules/sidenav/components/sidenav/sidenav.component.ts index 3d50d8d171..f4f27e2994 100644 --- a/client/src/app/ui/modules/sidenav/components/sidenav/sidenav.component.ts +++ b/client/src/app/ui/modules/sidenav/components/sidenav/sidenav.component.ts @@ -1,4 +1,4 @@ -import { Component, ContentChild, Input, TemplateRef, ViewChild } from '@angular/core'; +import { Component, ContentChild, inject, Input, TemplateRef, ViewChild } from '@angular/core'; import { MatSidenav } from '@angular/material/sidenav'; import { ViewPortService } from 'src/app/site/services/view-port.service'; @@ -34,7 +34,7 @@ export class SidenavComponent { return this.isMobile ? (this.sideNav?.opened ?? false) : this.desktopOpen; } - public constructor(private vp: ViewPortService) {} + private vp = inject(ViewPortService); public close(): void { if (this.isMobile) { diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service.ts index 4a4400926e..c6440a2aef 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { NotifyResponse, NotifyService } from 'src/app/gateways/notify.service'; @@ -11,12 +11,10 @@ import { ChessDialogModule } from '../chess-dialog.module'; providedIn: 'root' }) export class ChessChallengeService { - public constructor( - private notifyService: NotifyService, - private dialog: MatDialog, - private translate: TranslateService, - private prompt: PromptService - ) {} + private notifyService = inject(NotifyService); + private dialog = inject(MatDialog); + private translate = inject(TranslateService); + private prompt = inject(PromptService); public startListening(): void { this.notifyService diff --git a/client/src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component.ts b/client/src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component.ts index c343358b7f..6a5216165f 100644 --- a/client/src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component.ts +++ b/client/src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component.ts @@ -1,7 +1,7 @@ import { ArrayDataSource } from '@angular/cdk/collections'; import { CdkDragMove, CdkDragSortEvent, CdkDragStart } from '@angular/cdk/drag-drop'; import { FlatTreeControl } from '@angular/cdk/tree'; -import { Component, ContentChild, EventEmitter, Input, OnDestroy, Output, TemplateRef } from '@angular/core'; +import { Component, ContentChild, EventEmitter, inject, Input, OnDestroy, Output, TemplateRef } from '@angular/core'; import { auditTime, Observable, Subscription } from 'rxjs'; import { Displayable, Identifiable } from 'src/app/domain/interfaces'; import { FlatNode, TreeIdNode } from 'src/app/infrastructure/definitions/tree'; @@ -223,16 +223,8 @@ export class SortingTreeComponent implemen @ContentChild(TemplateRef, { static: true }) public innerNode!: TemplateRef; - /** - * Constructor - * - * @param treeService Service to get data from store and build the tree nodes. - * @param sortService Service to sort tree nodes by their given items. - */ - public constructor( - private treeService: TreeService, - private sortService: TreeSortService - ) {} + private treeService = inject(TreeService); + private sortService = inject(TreeSortService); /** * On destroy - unsubscribe the subscription diff --git a/client/src/app/ui/pipes/entries/entries.pipe.ts b/client/src/app/ui/pipes/entries/entries.pipe.ts index 6aeaa2b4a0..2e2bdbe785 100644 --- a/client/src/app/ui/pipes/entries/entries.pipe.ts +++ b/client/src/app/ui/pipes/entries/entries.pipe.ts @@ -1,5 +1,5 @@ import { KeyValue } from '@angular/common'; -import { KeyValueDiffer, KeyValueDiffers, Pipe, PipeTransform } from '@angular/core'; +import { inject, KeyValueDiffer, KeyValueDiffers, Pipe, PipeTransform } from '@angular/core'; interface IterableMap { [Symbol.iterator](): IterableIterator<[K, V]>; @@ -14,7 +14,7 @@ export class EntriesPipe implements PipeTransform { private keyValues: KeyValue[] = []; private compareFn: (a: KeyValue, b: KeyValue) => number = DefaultCompareFn; - public constructor(private readonly differs: KeyValueDiffers) {} + private readonly differs = inject(KeyValueDiffers); public transform( instance: IterableMap | any, diff --git a/client/src/app/ui/pipes/time/time.pipe.ts b/client/src/app/ui/pipes/time/time.pipe.ts index 88c3b0dcf1..68be3613fd 100644 --- a/client/src/app/ui/pipes/time/time.pipe.ts +++ b/client/src/app/ui/pipes/time/time.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import { inject, Pipe, PipeTransform } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; @Pipe({ @@ -7,7 +7,7 @@ import { TranslateService } from '@ngx-translate/core'; standalone: false }) export class TimePipe implements PipeTransform { - public constructor(private translate: TranslateService) {} + private translate = inject(TranslateService); public transform(timestamp: number): string { return new Date(timestamp * 1000).toLocaleString(this.translate.getCurrentLang()); diff --git a/client/src/app/ui/pipes/trust/trust.pipe.ts b/client/src/app/ui/pipes/trust/trust.pipe.ts index 7ebee3a6e1..579c46e5c6 100644 --- a/client/src/app/ui/pipes/trust/trust.pipe.ts +++ b/client/src/app/ui/pipes/trust/trust.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import { inject, Pipe, PipeTransform } from '@angular/core'; import { DomSanitizer, SafeHtml, SafeResourceUrl, SafeScript, SafeStyle, SafeUrl } from '@angular/platform-browser'; @Pipe({ @@ -6,7 +6,7 @@ import { DomSanitizer, SafeHtml, SafeResourceUrl, SafeScript, SafeStyle, SafeUrl standalone: false }) export class TrustPipe implements PipeTransform { - public constructor(protected sanitizer: DomSanitizer) {} + protected sanitizer = inject(DomSanitizer); public transform(value: any, type: string): SafeHtml | SafeStyle | SafeScript | SafeUrl | SafeResourceUrl { switch (type) { From 2d1f7819042d9f475922218dc0b3280fb1a60653 Mon Sep 17 00:00:00 2001 From: Ludwig Reiter Date: Thu, 9 Jul 2026 15:04:18 +0200 Subject: [PATCH 39/71] Use isListEmpty for disable list-search-selectors (#6380) --- .../list-search-selector.component.ts | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/client/src/app/ui/modules/search-selector/components/list-search-selector/list-search-selector.component.ts b/client/src/app/ui/modules/search-selector/components/list-search-selector/list-search-selector.component.ts index 776463671e..05a007f002 100644 --- a/client/src/app/ui/modules/search-selector/components/list-search-selector/list-search-selector.component.ts +++ b/client/src/app/ui/modules/search-selector/components/list-search-selector/list-search-selector.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Input, Optional, Self, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, Optional, Self, signal, ViewEncapsulation } from '@angular/core'; import { NgControl } from '@angular/forms'; import { MatFormFieldControl } from '@angular/material/form-field'; import { auditTime, distinctUntilChanged, Observable, Subscription } from 'rxjs'; @@ -18,6 +18,8 @@ import { BaseSearchSelectorComponent } from '../base-search-selector/base-search export class ListSearchSelectorComponent extends BaseSearchSelectorComponent { private _inputListValuesSubscription: Subscription; + private isListEmpty = signal(true); + /** * The inputlist subject. Subscribes to it and updates the selector, if the subject * changes its values. @@ -35,10 +37,7 @@ export class ListSearchSelectorComponent extends BaseSearchSelectorComponent { } else { this._inputListValuesSubscription = value.pipe(auditTime(10), distinctUntilChanged()).subscribe(items => { this.selectableItems = items; - if (this.contentForm) { - this.disabled = - (this.disabled || !items || (!!items && !items.length)) && !this.clickNotFound.observed; - } + this.isListEmpty.set(!items || (!!items && !items.length)); }); this.subscriptions.push(this._inputListValuesSubscription); } @@ -49,4 +48,13 @@ export class ListSearchSelectorComponent extends BaseSearchSelectorComponent { public constructor(@Optional() @Self() ngControl: NgControl) { super(ngControl); } + + public override get disabled(): boolean { + return super.disabled || (this.isListEmpty() && !this.clickNotFound.observed); + } + + @Input() + public override set disabled(value: boolean) { + super.disabled = value; + } } From 95a868253c434905419fc13e5f10c04a288c6586 Mon Sep 17 00:00:00 2001 From: Loki Elble <69210919+Elblinator@users.noreply.github.com> Date: Thu, 9 Jul 2026 15:16:33 +0200 Subject: [PATCH 40/71] Exchange mat-time-picker (#6382) --- client/package-lock.json | 291 ++++++++++++++---- client/package.json | 1 - ...settings-group-detail-field.component.html | 37 --- ...settings-group-detail-field.component.scss | 4 - ...g-settings-group-detail-field.component.ts | 61 +--- .../meeting-settings-group-detail.module.ts | 3 - .../motion-detail/motion-detail.module.ts | 4 +- .../motion-manage-timestamp.component.html | 14 +- .../motion-manage-timestamp.component.ts | 24 +- ...eeting-settings-definition.service.spec.ts | 18 +- .../meeting-settings-definition.service.ts | 2 - .../meeting-settings-definitions.ts | 2 - .../datepicker/datepicker.component.scss | 4 - .../daterangepicker.component.scss | 4 - 14 files changed, 261 insertions(+), 208 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 69f4fa2270..32bdf37dec 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -22,6 +22,7 @@ "@angular/router": "^21.2.17", "@angular/service-worker": "^21.2.17", "@cantoo/pdf-lib": "^2.7.1", + "@coreui/angular-chartjs": "~5.6.25", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", "@intevation/tiptap-extension-office-paste": "^0.1.2", @@ -63,7 +64,6 @@ "ngx-date-fns": "^12.0.1", "ngx-device-detector": "^11.0.0", "ngx-file-drop": "^16.0.0", - "ngx-material-timepicker": "^13.1.1", "ngx-papaparse": "^8.0.0", "pdfmake": "^0.3.11", "pofile": "^1.1.4", @@ -407,6 +407,40 @@ } } }, + "node_modules/@angular-devkit/architect/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@angular-devkit/architect/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@angular-devkit/schematics": { "version": "21.2.18", "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-21.2.18.tgz", @@ -454,6 +488,40 @@ } } }, + "node_modules/@angular-devkit/schematics/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@angular-devkit/schematics/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@angular-eslint/builder": { "version": "21.4.0", "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-21.4.0.tgz", @@ -498,6 +566,40 @@ } } }, + "node_modules/@angular-eslint/builder/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@angular-eslint/builder/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@angular-eslint/eslint-plugin": { "version": "21.4.0", "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-21.4.0.tgz", @@ -626,6 +728,40 @@ } } }, + "node_modules/@angular-eslint/schematics/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@angular-eslint/schematics/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@angular-eslint/template-parser": { "version": "21.4.0", "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-21.4.0.tgz", @@ -1394,6 +1530,40 @@ } } }, + "node_modules/@angular/cli/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@angular/cli/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@angular/common": { "version": "21.2.17", "resolved": "https://registry.npmjs.org/@angular/common/-/common-21.2.17.tgz", @@ -3831,9 +4001,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -3851,9 +4018,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -3871,9 +4035,6 @@ "ppc64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -3891,9 +4052,6 @@ "riscv64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -3911,9 +4069,6 @@ "s390x" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -3931,9 +4086,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -3951,9 +4103,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -5335,6 +5484,40 @@ } } }, + "node_modules/@schematics/angular/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@schematics/angular/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@sigstore/bundle": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-4.0.0.tgz", @@ -6578,13 +6761,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/luxon": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz", - "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==", - "license": "MIT", - "peer": true - }, "node_modules/@types/node": { "version": "24.10.14", "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.14.tgz", @@ -7181,6 +7357,40 @@ } } }, + "node_modules/angular-eslint/node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/angular-eslint/node_modules/readdirp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/ansi-escapes": { "version": "7.3.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz", @@ -11693,16 +11903,6 @@ "yallist": "^3.0.2" } }, - "node_modules/luxon": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.0.tgz", - "integrity": "sha512-WE7p0p7W1xji9qxkLYsvcIxZyfP48GuFrWIBQZIsbjCyf65dG1rv4n83HcOyEyhvzxJCrUoObCRNFgRNIQ5KNA==", - "license": "MIT", - "peer": true, - "engines": { - "node": ">=12" - } - }, "node_modules/m3u8-parser": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-7.2.0.tgz", @@ -12265,19 +12465,6 @@ "@angular/core": ">=14.0.0" } }, - "node_modules/ngx-material-timepicker": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/ngx-material-timepicker/-/ngx-material-timepicker-13.1.1.tgz", - "integrity": "sha512-GST4IBFXrPSBB5VP5LVxoOk1yHbdSnaB293tjuyu+vusg+pQ/3+AtcxQEIadk6Nmsdt8zKsbXNgvLrI4nbYRKQ==", - "license": "MIT", - "dependencies": { - "tslib": "^2.0.0" - }, - "peerDependencies": { - "@types/luxon": ">= 1.11.1", - "luxon": ">= 1.24.0" - } - }, "node_modules/ngx-papaparse": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/ngx-papaparse/-/ngx-papaparse-8.0.0.tgz", diff --git a/client/package.json b/client/package.json index 021df6f3dd..827c0deb9f 100644 --- a/client/package.json +++ b/client/package.json @@ -87,7 +87,6 @@ "ngx-date-fns": "^12.0.1", "ngx-device-detector": "^11.0.0", "ngx-file-drop": "^16.0.0", - "ngx-material-timepicker": "^13.1.1", "ngx-papaparse": "^8.0.0", "pdfmake": "^0.3.11", "pofile": "^1.1.4", diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html index 9aba4033c2..f4c8c618bd 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.html @@ -124,43 +124,6 @@
} - - @if (setting.type === 'datetime' || setting.type === 'date') { -
- -
- @if (setting.type === 'datetime') { - - -
- @if (updateSuccessIcon) { - error - } - - access_time - -
- @if (error) { - {{ error }} - } - - - } -
-
- } - @if (setting.type === 'daterange') {
diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.scss b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.scss index 8c526026df..9a5a1d3db3 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.scss +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.scss @@ -33,10 +33,6 @@ margin-bottom: 10px; } } - - .ngx-material-timepicker-toggle { - width: 28px; - } } } } diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.ts b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.ts index f09e2e0407..3f12ec44b6 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.ts +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.ts @@ -12,7 +12,6 @@ import { import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; -import { fromUnixTime, getHours, getMinutes, getUnixTime, setHours, setMinutes } from 'date-fns'; import { distinctUntilChanged, filter, map, Observable } from 'rxjs'; import { Settings } from 'src/app/domain/models/meetings/meeting'; import { BaseComponent } from 'src/app/site/base/base.component'; @@ -110,11 +109,6 @@ export class MeetingSettingsGroupDetailFieldComponent extends BaseComponent impl public get currentValue(): any { const value = this.form.get(`value`); - if (this.setting.type === `datetime` || this.setting.type === `date`) { - const date = this.form.get(`date`)!.value; - const time = this.form.get(`time`)!.value; - return this.dateAndTimeToUnix(date, time); - } return value.value; } @@ -218,7 +212,6 @@ export class MeetingSettingsGroupDetailFieldComponent extends BaseComponent impl this.form = this.formBuilder.group({ value: [``, this.setting.validators ?? []], - date: [``], time: [``], daterange: [ { @@ -231,10 +224,6 @@ export class MeetingSettingsGroupDetailFieldComponent extends BaseComponent impl this.form.disable(); } this.internalValue = this.value ?? this.meetingSettingsDefinitionProvider.getDefaultValue(this.setting); - if ((this.setting.type === `datetime` || this.setting.type === `date`) && this.value) { - const datetimeObj = this.getRestrictedValue(this.unixToDateAndTime(this.value as number)); - this.form.patchValue(datetimeObj); - } if (this.setting.type === `daterange` && this.value) { const daterangeObj = { start: this.getRestrictedValue(this.value[0] ? new Date(this.value[0] * 1000) : null), @@ -298,10 +287,6 @@ export class MeetingSettingsGroupDetailFieldComponent extends BaseComponent impl } public updateValue(newValue: any): void { - if ((this.setting.type === `datetime` || this.setting.type === `date`) && newValue) { - const datetimeObj = this.getRestrictedValue(this.unixToDateAndTime(newValue as number)); - this.form.patchValue(datetimeObj); - } if (this.setting.type === `daterange` && newValue) { const daterangeObj = { start: this.getRestrictedValue(newValue[0] ? new Date(newValue[0]) : null), @@ -321,41 +306,6 @@ export class MeetingSettingsGroupDetailFieldComponent extends BaseComponent impl }; } - /** - * Helper function to split a unix timestamp into a date as a date object and a time string in the form of HH:SS - * - * @param unix the timestamp - * - * @return an object with a date and a time field - */ - private unixToDateAndTime(unix: number): { date: Date; time: string } { - const date = fromUnixTime(unix); - const time = getHours(date) + `:` + getMinutes(date); - return { date, time }; - } - - /** - * Helper function to fuse a date object as the date part and a time string (HH:SS) as the time part. - * - * @param date the date object - * @param time the time string - * - * @return a unix timestamp - */ - private dateAndTimeToUnix(date: Date, time: string): number | null { - if (date) { - if (time) { - const timeSplit = time.split(`:`); - // + is faster than parseint and number(). ~~ would be fastest but prevented by linter... - setHours(date, +timeSplit[0]); - setMinutes(date, +timeSplit[1]); - } - return getUnixTime(date); - } else { - return null; - } - } - /** * Trigger an update of the data */ @@ -364,11 +314,6 @@ export class MeetingSettingsGroupDetailFieldComponent extends BaseComponent impl case `markupText`: // tinyMCE markuptext does not autoupdate on change, only when entering or leaving return; - case `date`: - case `datetime`: - // datetime has to be converted - value = this.dateAndTimeToUnix(this.form.get(`date`)!.value, this.form.get(`time`)!.value); - break; case `daterange`: // daterange has to be formatted value = [this.form.get(`daterange`)!.value.start, this.form.get(`daterange`)!.value.end]; @@ -401,10 +346,6 @@ export class MeetingSettingsGroupDetailFieldComponent extends BaseComponent impl this.form.controls[`value`].setValue(this.meetingSettingsDefinitionProvider.getDefaultValue(this.setting)); } - public onClearDate(): void { - this.form.controls[`date`].setValue(null); - } - /** * Sends an update request for the config item to the server. * @param value The new value to set. @@ -440,7 +381,7 @@ export class MeetingSettingsGroupDetailFieldComponent extends BaseComponent impl * @returns wheather it should be excluded or not */ public isExcludedType(type: string): boolean { - const excluded = [`boolean`, `markupText`, `text`, `translations`, `ranking`, `datetime`, `date`, `daterange`]; + const excluded = [`boolean`, `markupText`, `text`, `translations`, `ranking`, `daterange`]; return excluded.includes(type); } diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail.module.ts b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail.module.ts index 5d7d19a0aa..9cdbcbb650 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail.module.ts +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail.module.ts @@ -10,8 +10,6 @@ import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; -// time picker because angular still doesnt offer one!! -import { NgxMaterialTimepickerModule } from 'ngx-material-timepicker'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { DirectivesModule } from 'src/app/ui/directives'; import { DatepickerModule } from 'src/app/ui/modules/datepicker'; @@ -52,7 +50,6 @@ import { MeetingSettingsGroupDetailRoutingModule } from './meeting-settings-grou MatDatepickerModule, MatTooltipModule, MatInputModule, - NgxMaterialTimepickerModule, FormsModule, ReactiveFormsModule, DatepickerModule, diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts index 3c15e70c98..44151d038d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts @@ -17,9 +17,9 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatSelectModule } from '@angular/material/select'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatTabsModule } from '@angular/material/tabs'; +import { MatTimepickerModule } from '@angular/material/timepicker'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { NgxMaterialTimepickerModule } from 'ngx-material-timepicker'; import { ChipSelectModule } from 'src/app/site/modules/chip-select/chip-select.module'; import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; @@ -128,6 +128,7 @@ import { MotionDetailServiceModule } from './services/motion-detail-service.modu MatFormFieldModule, MatTabsModule, MatTooltipModule, + MatTimepickerModule, MatChipsModule, MatCheckboxModule, MatSelectModule, @@ -137,7 +138,6 @@ import { MotionDetailServiceModule } from './services/motion-detail-service.modu MatProgressBarModule, ParticipantSearchSelectorModule, OpenSlidesDateAdapterModule, - NgxMaterialTimepickerModule, DatepickerModule, // Detail view ScrollingModule, diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.html index 21d6a7b69a..73e46d1fcc 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.html @@ -24,15 +24,15 @@

- + +
- - - access_time - - + + access_time +
- + +

diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.ts index c7330d6a17..1d9b229b87 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; -import { fromUnixTime, getHours, getMinutes, isDate } from 'date-fns'; +import { fromUnixTime, isDate } from 'date-fns'; import { Permission } from 'src/app/domain/definitions/permission'; import { KeyOfType } from 'src/app/infrastructure/utils/keyof-type'; import { OperatorService } from 'src/app/site/services/operator.service'; @@ -73,13 +73,11 @@ export class MotionManageTimestampComponent extends BaseUiComponent implements O this.subscriptions.push( this.form.get(`date`).valueChanges.subscribe(currDate => { - if (isDate(currDate) !== !!this.form.get(`time`).value) { - this.form.get(`time`).setValue(isDate(currDate) ? `00:00` : ``); - } + this.form.get(`time`).setValue(currDate ?? null); }), this.form.get(`time`).valueChanges.subscribe(currTime => { if (!!currTime !== isDate(this.form.get(`date`).value)) { - this.form.get(`date`).setValue(currTime ? new Date() : null); + this.form.get(`date`).setValue(currTime); } }) ); @@ -95,10 +93,9 @@ export class MotionManageTimestampComponent extends BaseUiComponent implements O } public async onSave(): Promise { - const date: { date: Date | null; time: string } = this.form.value; - const [hours, minutes, ..._] = date.time.split(`:`); + const date: { date: Date | null; time: Date } = this.form.value; if (date.date) { - date.date.setHours(+hours, +minutes); + date.date.setHours(+date.time.getHours(), +date.time.getMinutes()); } await this.motionController .update({ [this.field]: date.date ? Math.floor(date.date.getTime() / 1000) : null }, this.motion) @@ -119,7 +116,10 @@ export class MotionManageTimestampComponent extends BaseUiComponent implements O public onEdit(): void { const timestamp = this.motion[this.field]; const date = timestamp - ? this.getTimes(timestamp) + ? { + date: fromUnixTime(timestamp), + time: fromUnixTime(timestamp) + } : { date: ``, time: `` @@ -128,12 +128,6 @@ export class MotionManageTimestampComponent extends BaseUiComponent implements O this.isEditMode = true; } - public getTimes(timestamp: number): { date: Date; time: string } { - const date = fromUnixTime(timestamp); - const time = getHours(date) + `:` + getMinutes(date); - return { date, time }; - } - public clearForm(): void { this.form.patchValue({ date: ``, diff --git a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.spec.ts b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.spec.ts index 377abe25f4..5eadef335d 100644 --- a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.spec.ts +++ b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.spec.ts @@ -36,16 +36,6 @@ const fakeSettings: SettingsGroup[] = [ label: `Setting two and three`, type: `daterange` }, - { - key: `four` as keyof Settings, - label: `Setting four`, - type: `datetime` - }, - { - key: `five` as keyof Settings, - label: `Setting five`, - type: `date` - }, { key: `a` as keyof Settings, label: `Setting a` @@ -74,7 +64,7 @@ const fakeSettings: SettingsGroup[] = [ key: `bool` as keyof Settings, label: `Boolean setting`, type: `boolean` - }, // + }, { key: `groups` as keyof Settings, label: `Group setting`, @@ -124,7 +114,7 @@ const fakeSettingsMap: Record = fakeSettings ); const fakeSettingsDefaults: Record = { - ...[`one`, `two`, `four`, `five`].mapToObject((prop, index) => ({ [prop]: index + 1 })), + ...[`one`, `two`].mapToObject((prop, index) => ({ [prop]: index + 1 })), bool: true, ...[`a`, `b`, `c`, `d`].mapToObject(letter => ({ [letter]: letter })), e: `e.mail@email.mail`, @@ -136,7 +126,7 @@ const fakeSettingsDefaults: Record = { }; const fakeBrokenSettingsDefaults: Record = { - ...[`one`, `two`, `four`, `five`].mapToObject(letter => ({ [letter]: letter })), + ...[`one`, `two`].mapToObject(letter => ({ [letter]: letter })), bool: `not a bool`, ...[`a`, `b`, `c`, `d`].mapToObject((prop, index) => ({ [prop]: index + 1 })), e: 3, @@ -154,8 +144,6 @@ const typeToDefault: Record = { translations: {}, ranking: [], choice: null, - date: null, - datetime: null, daterange: [null, null], string: ``, text: ``, diff --git a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.ts b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.ts index fcc9f33cc9..723d04990c 100644 --- a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.ts +++ b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.ts @@ -53,8 +53,6 @@ export class MeetingSettingsDefinitionService { case `ranking`: return []; case `choice`: - case `date`: - case `datetime`: return null; case `daterange`: return [null, null]; diff --git a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts index d289dae50a..a85410bfbf 100644 --- a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts +++ b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts @@ -26,8 +26,6 @@ export type SettingsType = | `integer` | `boolean` | `choice` - | `date` - | `datetime` | `translations` | `ranking` | `groups` diff --git a/client/src/app/ui/modules/datepicker/components/datepicker/datepicker.component.scss b/client/src/app/ui/modules/datepicker/components/datepicker/datepicker.component.scss index 2ebe6aaeb1..cc2821bc9a 100644 --- a/client/src/app/ui/modules/datepicker/components/datepicker/datepicker.component.scss +++ b/client/src/app/ui/modules/datepicker/components/datepicker/datepicker.component.scss @@ -20,10 +20,6 @@ margin-bottom: 10px; } } - - .ngx-material-timepicker-toggle { - width: 28px; - } } } } diff --git a/client/src/app/ui/modules/datepicker/components/daterangepicker/daterangepicker.component.scss b/client/src/app/ui/modules/datepicker/components/daterangepicker/daterangepicker.component.scss index 2ebe6aaeb1..cc2821bc9a 100644 --- a/client/src/app/ui/modules/datepicker/components/daterangepicker/daterangepicker.component.scss +++ b/client/src/app/ui/modules/datepicker/components/daterangepicker/daterangepicker.component.scss @@ -20,10 +20,6 @@ margin-bottom: 10px; } } - - .ngx-material-timepicker-toggle { - width: 28px; - } } } } From a917413ed12a6ea7735b651655ce64fd95e2279a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jul 2026 15:20:15 +0200 Subject: [PATCH 41/71] Bump node from 24.14-alpine to 24.18-alpine (#6334) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index aab6e58416..8c03aa28dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:24.14-alpine AS base +FROM node:24.18-alpine AS base ## Setup ARG CONTEXT From ac7c3779b8a9992d2ce233ef5d0759dbeeb41198 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jul 2026 15:20:49 +0200 Subject: [PATCH 42/71] Bump the typescript-eslint group in /client with 3 updates (#6365) --- client/package-lock.json | 128 +++++++++++++++++++-------------------- client/package.json | 6 +- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 32bdf37dec..e559b8132d 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -93,8 +93,8 @@ "@types/qrcode": "^1.5.6", "@types/tinycolor2": "^1.4.6", "@types/video.js": "^7.3.58", - "@typescript-eslint/eslint-plugin": "^8.62.0", - "@typescript-eslint/parser": "^8.62.0", + "@typescript-eslint/eslint-plugin": "^8.63.0", + "@typescript-eslint/parser": "^8.63.0", "@vendure/ngx-translate-extract": "^10.1.3", "angular-eslint": "^21.4.0", "eslint": "^9.39.4", @@ -116,7 +116,7 @@ "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.62.1" + "typescript-eslint": "^8.63.0" } }, "../packages/openslides-motion-diff": { @@ -6817,17 +6817,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.62.1.tgz", - "integrity": "sha512-4EQM77WgVNxj7OkL/5b/D/xZsw00G577+UriYTC7JF5opcF3T2AuoeY7ueLaZgSVjSgCS6yOAJB5bRGLPSJUzA==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.63.0.tgz", + "integrity": "sha512-rvwSgqT+DHpWdzfSzPatRLm02a0GlESt++9iy3hLCDY4BgkaLcl8LBi9Yh7XGFBpwcBE/K3024QuXWTpbz4FfQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.62.1", - "@typescript-eslint/type-utils": "8.62.1", - "@typescript-eslint/utils": "8.62.1", - "@typescript-eslint/visitor-keys": "8.62.1", + "@typescript-eslint/scope-manager": "8.63.0", + "@typescript-eslint/type-utils": "8.63.0", + "@typescript-eslint/utils": "8.63.0", + "@typescript-eslint/visitor-keys": "8.63.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -6840,22 +6840,22 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.62.1", + "@typescript-eslint/parser": "^8.63.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.1.tgz", - "integrity": "sha512-sPhE4iHuJDSvoAiec+Ro8JyXw8f0ql13HFR82P99nCm9GwTEKG0KYLvDe6REk8BCXuit6vJAv/Yxg5ABaNS2rA==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.63.0.tgz", + "integrity": "sha512-gwh4gvvlaVDKKxyfxMG+Gnu1u9X0OQBwyGLkbwB65dIzBKnxeRiJlNFqlI3zwVhNXJIs6qV7mlFCn/BIajlVig==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.62.1", - "@typescript-eslint/types": "8.62.1", - "@typescript-eslint/typescript-estree": "8.62.1", - "@typescript-eslint/visitor-keys": "8.62.1", + "@typescript-eslint/scope-manager": "8.63.0", + "@typescript-eslint/types": "8.63.0", + "@typescript-eslint/typescript-estree": "8.63.0", + "@typescript-eslint/visitor-keys": "8.63.0", "debug": "^4.4.3" }, "engines": { @@ -6871,14 +6871,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.1.tgz", - "integrity": "sha512-yQ3RgY5RkSBpsNS1Bx/JQEcA24FOSdfGktoyprAr5u18390UQdtVcfnEv4nIrIshNnavlVyZBKxQwT1fIAE6cg==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.63.0.tgz", + "integrity": "sha512-e5dh0/UI0ok53AlZ5wRkXCB32z/f2jUZqPR/ygAw5WYaSw8j9EoJWlS7wQjr/dmOaqWjnPIn2m+HhVPCMWGZVQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.62.1", - "@typescript-eslint/types": "^8.62.1", + "@typescript-eslint/tsconfig-utils": "^8.63.0", + "@typescript-eslint/types": "^8.63.0", "debug": "^4.4.3" }, "engines": { @@ -6893,14 +6893,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.1.tgz", - "integrity": "sha512-r4d249KbQ1SFdpeStvob8Ih6aPPIzfqllPVOtvhve6ZcpuVcYo5/7zUWckKpHE7StASX4kTKZTLf0WQm/wPkcg==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.63.0.tgz", + "integrity": "sha512-uUyfMWCnDSN8bCpcrY8nGP2BLkQ9Xn0GsipcONcpIDWhwhO4ZSyHvyS14U3X75mzxWxL3I2UZIrenTzdzcJO8A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.62.1", - "@typescript-eslint/visitor-keys": "8.62.1" + "@typescript-eslint/types": "8.63.0", + "@typescript-eslint/visitor-keys": "8.63.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6911,9 +6911,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.1.tgz", - "integrity": "sha512-xadytJqX9vJVQ2fdQjkcIVigwaOJNWkpjdLt6cEQ+xPnrI1fkp+/jZE/I97k9KUjqtpd25i0HeyZf3T6dutv2g==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.63.0.tgz", + "integrity": "sha512-sUAbkulqBAsncKnbRP3+7CtQFRKicexnj7ZwNC6ddCR7EmrXvjvdCYMJbUIqMd6lwoEriZjwLo08aS5tSjVMHg==", "dev": true, "license": "MIT", "engines": { @@ -6928,15 +6928,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.62.1.tgz", - "integrity": "sha512-aXM5xlqXiTxPibXB93cLAURfT3rlizf7uMXISCXy66Isr/9hISJx3yDsKl0L7lKa51b8JpFuNKby0/O0pEm9jg==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.63.0.tgz", + "integrity": "sha512-Nzzh/OGxVCOjObjaj1CQF2RUasyYy2Jfuh+zZ3PjLzG2fYRriAiZLib9UKtO+CpQAS3YHiAS+ckZDclwqI1TPA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.62.1", - "@typescript-eslint/typescript-estree": "8.62.1", - "@typescript-eslint/utils": "8.62.1", + "@typescript-eslint/types": "8.63.0", + "@typescript-eslint/typescript-estree": "8.63.0", + "@typescript-eslint/utils": "8.63.0", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -6953,9 +6953,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.1.tgz", - "integrity": "sha512-ooCzJFaf+Hg+uG6fA3NRFGuFjlfNlDhBthbv4ZPU/0elCAFUfnyXUvf/WOpHz/jYwSmvU2GkR2LtyUfy1AxZ1Q==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.63.0.tgz", + "integrity": "sha512-xyLtl9DUBBFrcJS4x2pIqGLH68/tC2uOa4Z7pUteW09D3bXnnXUom4dyPikzWgB7llmIc1zoeI3aoUdC4rPK/Q==", "dev": true, "license": "MIT", "engines": { @@ -6967,16 +6967,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.1.tgz", - "integrity": "sha512-xMcW9oP9u7fAMXYs9A65CVmtLQe2r//oXINHfi8HV+oiqhih17sbLdhXr4540YWlgpDKQdY854OL5ZrdCiQsAA==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.63.0.tgz", + "integrity": "sha512-ygBkU+B7ex5UI/gKhaqexWev79uISfIv7XQCRNYO/jmD8rGLPyWLAb3KMRT6nd8Gt9bmUBi9+iX6tBdYfOY81Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.62.1", - "@typescript-eslint/tsconfig-utils": "8.62.1", - "@typescript-eslint/types": "8.62.1", - "@typescript-eslint/visitor-keys": "8.62.1", + "@typescript-eslint/project-service": "8.63.0", + "@typescript-eslint/tsconfig-utils": "8.63.0", + "@typescript-eslint/types": "8.63.0", + "@typescript-eslint/visitor-keys": "8.63.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -6995,16 +6995,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.1.tgz", - "integrity": "sha512-sHtbPfuKNZCG+ih8SyjjucqRntSVmp8XgL5u6o9mAhiSn8ds5o/M/XdM0abweme2Tln3szOstOrZ9OXitvPh0g==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.63.0.tgz", + "integrity": "sha512-fUKaeAvrTuQg/Tgt3nliAUSZHJM6DlCcfyEmxCvlX8kieWSStBX+5O5Fnidtc3i2JrH+9c/GL4RY2iasd/GPTA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.62.1", - "@typescript-eslint/types": "8.62.1", - "@typescript-eslint/typescript-estree": "8.62.1" + "@typescript-eslint/scope-manager": "8.63.0", + "@typescript-eslint/types": "8.63.0", + "@typescript-eslint/typescript-estree": "8.63.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7019,13 +7019,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.1.tgz", - "integrity": "sha512-4g3BLxfdTMy8iZG0MaBkadnlRrCJ74cQiFbyEVMrkwIoqdyaXXQM22cotDvrl4x28wgIZ9rEJRoM+mmhSJpJ1g==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.63.0.tgz", + "integrity": "sha512-UexrHGnGTpbuQHct2ExOc2ZcFbGUS9FOesCxxqdBGcpI1BxYu/LZ6U8Aq6/72XtF/qRBk9nhuGHFJIXXMhPMdw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.62.1", + "@typescript-eslint/types": "8.63.0", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -15038,16 +15038,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.62.1", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.62.1.tgz", - "integrity": "sha512-vymnnM5g0AKQDSAyfP12nMIBvgwgA42syg74kkuZ4x1VuTzwQKwc5h9rGxeShCjny5o+zWAb6OEoz7XLgrIkIw==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.63.0.tgz", + "integrity": "sha512-xgwXyzG4sK9ALkBxbyGkTMMOS+imnW65iPhxCQMK83KhxyoDNW7l+IDqEf9vMdoUidHpOoS967RCq4eMiTexwQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.62.1", - "@typescript-eslint/parser": "8.62.1", - "@typescript-eslint/typescript-estree": "8.62.1", - "@typescript-eslint/utils": "8.62.1" + "@typescript-eslint/eslint-plugin": "8.63.0", + "@typescript-eslint/parser": "8.63.0", + "@typescript-eslint/typescript-estree": "8.63.0", + "@typescript-eslint/utils": "8.63.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" diff --git a/client/package.json b/client/package.json index 827c0deb9f..88ecab3c3b 100644 --- a/client/package.json +++ b/client/package.json @@ -116,8 +116,8 @@ "@types/qrcode": "^1.5.6", "@types/tinycolor2": "^1.4.6", "@types/video.js": "^7.3.58", - "@typescript-eslint/eslint-plugin": "^8.62.0", - "@typescript-eslint/parser": "^8.62.0", + "@typescript-eslint/eslint-plugin": "^8.63.0", + "@typescript-eslint/parser": "^8.63.0", "@vendure/ngx-translate-extract": "^10.1.3", "angular-eslint": "^21.4.0", "eslint": "^9.39.4", @@ -139,7 +139,7 @@ "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.62.1" + "typescript-eslint": "^8.63.0" }, "browser": { "fs": false From 4b9908dab6a4414581199c96896c3e2eca67c0c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jul 2026 15:21:10 +0200 Subject: [PATCH 43/71] Bump the tiptap group in /client with 14 updates (#6366) --- client/package-lock.json | 384 +++++++++++++++++++-------------------- client/package.json | 20 +- 2 files changed, 202 insertions(+), 202 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index e559b8132d..586a2aac45 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -31,20 +31,20 @@ "@ngx-translate/core": "^17.0.0", "@ngx-translate/http-loader": "^17.0.0", "@openslides/motion-diff": "file:../packages/openslides-motion-diff", - "@tiptap/core": "^3.27.2", - "@tiptap/extension-color": "^3.27.2", - "@tiptap/extension-highlight": "^3.27.2", - "@tiptap/extension-image": "^3.27.2", + "@tiptap/core": "^3.27.3", + "@tiptap/extension-color": "^3.27.3", + "@tiptap/extension-highlight": "^3.27.3", + "@tiptap/extension-image": "^3.27.3", "@tiptap/extension-link": "^3.23.4", "@tiptap/extension-list": "^3.22.4", - "@tiptap/extension-subscript": "^3.27.2", - "@tiptap/extension-superscript": "^3.27.2", - "@tiptap/extension-table": "^3.27.2", - "@tiptap/extension-text-align": "^3.27.2", + "@tiptap/extension-subscript": "^3.27.3", + "@tiptap/extension-superscript": "^3.27.3", + "@tiptap/extension-table": "^3.27.3", + "@tiptap/extension-text-align": "^3.27.3", "@tiptap/extension-text-style": "^3.4.2", "@tiptap/extensions": "^3.22.4", - "@tiptap/pm": "^3.27.1", - "@tiptap/starter-kit": "^3.27.2", + "@tiptap/pm": "^3.27.3", + "@tiptap/starter-kit": "^3.27.3", "@tsparticles/angular": "^3.0.0", "@tsparticles/engine": "^3.9.1", "@tsparticles/plugin-emitters": "^3.9.1", @@ -5642,191 +5642,219 @@ } }, "node_modules/@tiptap/core": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.27.2.tgz", - "integrity": "sha512-zRWROdDbeIghFIT05ZYc+0cCkQFBy7sN/VjFc41qJ1fuq+lfgGDotVUXLuVqVe288jSpo/VGmy/iFLIQTc9mwg==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.27.3.tgz", + "integrity": "sha512-TJj5929M96C1KlH796wS8MywfHDh49RhmakOyzyMMc9pFmRj9UXi1gj0TCXgsZtjEOG7B+m/DRvNOvnuvR9kmg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/pm": "3.27.2" + "@tiptap/pm": "3.27.3" } }, "node_modules/@tiptap/extension-blockquote": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.27.2.tgz", - "integrity": "sha512-pafmW5GPZnRktQ4TegU8PIP+udboPw0O0AWYKk9HVDTI+VAqGwe1Xmb9k8tPCyn3et7LO62r14pK3S8Av+dxWQ==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.27.3.tgz", + "integrity": "sha512-VGoVMcqcGkkoduzEqQ70ZK5OOHBDn5iYeHJSgkvNoSHzYHl0CaKoWxoDKJjSWC5DAM4mBU+tXTlsiUp3evRMfA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extension-bold": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.27.2.tgz", - "integrity": "sha512-R+HZ/symZZhhnxZf3xyGbm2mWf48K+/kYucm88TMzMUWBjXhnL1G2JwaURxXUXb0nvsz6T2IqOhPKwCvAtb7oQ==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.27.3.tgz", + "integrity": "sha512-pchbycFppBqBmvk+OxrQLIPZLNd3rNbcm7zOa+OTjluphpAcsJ6AmHBmiRhJUYWitV6/SA+0nujcaWxBp5hNcQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extension-bullet-list": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.27.2.tgz", - "integrity": "sha512-YYJfm3IBTOccraVUavKIPQEspZlfCmL1zlcve93OVwujo0ndgk0fy6tp7Xs2EA4dXy303fnu5xKs1H08hkqQMg==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.27.3.tgz", + "integrity": "sha512-owQW6mcgnYgQU1z5BqmslcjZFBUm1SGM/Ax++4R6XelIt/7ol6uSTjzjAzum+ASW7UlBbuJHuSgRjl8cA+RGkg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.2" + "@tiptap/extension-list": "3.27.3" } }, "node_modules/@tiptap/extension-code": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.27.2.tgz", - "integrity": "sha512-IeWL8DP6dlvSfj3hvluX+pztpNi4tZdyUvcCYG8ODj4WVHom0Vrfila88hNsL8YXbbQ0iNPLoYgcffjfWEm6aA==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.27.3.tgz", + "integrity": "sha512-T7JF10Y3k7fyVujXXLVubdUh7fctgBUoiuxbvjotpltg1U/mPbOcT0UW/uif9j3H8TFvAwNApVw3x8bwwFUakA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" + } + }, + "node_modules/@tiptap/extension-code-block": { + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.27.3.tgz", + "integrity": "sha512-3CVnzkpGoqqI5KaXI9l9PMwLkx34SYY63tpeo0I0QjDk4LU+JTAQDTPJFSwB4zTsHZ7ZFMU0jjasFOZ1kZRVgw==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/ueberdosis" + }, + "peerDependencies": { + "@tiptap/core": "3.27.3", + "@tiptap/pm": "3.27.3" } }, "node_modules/@tiptap/extension-color": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-color/-/extension-color-3.27.2.tgz", - "integrity": "sha512-X2Mo7y/49OFg/5I9B2APgXd1DsxseLXyvnvpFBGGj1AYqYGxvvJ9thvyLZr7SZVGjnAlbu3kwI2lhRQdyyIq8w==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-color/-/extension-color-3.27.3.tgz", + "integrity": "sha512-tNXyK3VXPGygJP+vq1+YyPmrxLabx4vs+rYiVhGtmhIapTQeMVYcHbFH4s4v3h5m8JGVlTWnpI8n7cb5ExIhSQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-text-style": "3.27.2" + "@tiptap/extension-text-style": "3.27.3" } }, "node_modules/@tiptap/extension-document": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.27.2.tgz", - "integrity": "sha512-RkvCVKsAUEBxdc5EltXQfaiC33/PFByokRuVI08IeQDukwF9lrvba/O8vHAcHAh+XWTiy+U88m5ORLUO1MIlJA==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.27.3.tgz", + "integrity": "sha512-PR25MRv56Nm4ETVLwA8nAh/0RrVdvD4D2nxnAC8kUkxz1WOYDaqTfPqqEeSWDoUUTUp1I1xzDkD4x0gEnAlmZA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extension-dropcursor": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.27.2.tgz", - "integrity": "sha512-PUMhuvP4zyv41iRR06m87DoeLCBbT6SFstz9QZCZcK6+17rk8cdifFE+LIfRPAoPYEO/+jRoCcJ7BhGrOJDWzA==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.27.3.tgz", + "integrity": "sha512-XsL0Ziual+ynXyx5JgLb0KIOShlMN3MW7+GQvf9PGRb1vOB7IOTRFDxMPrxDWcFIZ6WWMWSrbkCLOKHStt1BWg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "3.27.2" + "@tiptap/extensions": "3.27.3" } }, "node_modules/@tiptap/extension-gapcursor": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.27.2.tgz", - "integrity": "sha512-yT5/qzjJHVNfbXOWaQBbIqomhEWgi9ScB6gbY6TdYREqSIZiLVCEjXo9mDU2kiTFLoOznJ6p7BlhmluzKpI6NQ==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.27.3.tgz", + "integrity": "sha512-MVBqzwYrDOttkn2GOrvvKTDCymfSS2VGSKpahcKKhge5mweSDiqko2X1vBDnMF8aVW3WxIFfDMmO4VMmh8HDZA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "3.27.2" + "@tiptap/extensions": "3.27.3" } }, "node_modules/@tiptap/extension-hard-break": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.27.2.tgz", - "integrity": "sha512-nlr095C2FOOXF77gp1xKUUdpnvACckyVhIQJyurxOpHFtKFNEL/850MX/QhPHMAbGb/VdkcBqyLvQI59i0pA9A==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.27.3.tgz", + "integrity": "sha512-cySObJITR2CRrWII87mI2LJ12wEETTnxt2p1vvC6ZtUmKnB50fOu+ux8ZEt6KYNocIOtrEZthNFzTOx7R7UtrQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extension-heading": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.27.2.tgz", - "integrity": "sha512-AERG0GecEYhQ3j4y1VK+FsDcl1PN5IPMTFZNEbsqyo/ZZBE1bIGriTV5/dTAWPfmUFnJEfR7FYTkqu2cMvL+oA==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.27.3.tgz", + "integrity": "sha512-QHXnsNic6iId8pnsFZ8z4PkX5L+HCHa/D7rAi3nNWtPlSIAOxo4nKrALcB5/tHmY+XL8kEXKH3nsNLNEDLCYPg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extension-highlight": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-highlight/-/extension-highlight-3.27.2.tgz", - "integrity": "sha512-+PhUkhh8g9a005FvwtDVnxRzadLO2tBWY4plUfJJDDpFIC0lTSxc0Q6ESBEV4x/BnuClH/RKH+tZAhkyEqeTeQ==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-highlight/-/extension-highlight-3.27.3.tgz", + "integrity": "sha512-99QYxMx8F/NhdvznM8/Zhm4XiCdMU0OEiLwPvLNObJiKV8UBqjdA68cJLX6FRuOi2nqD7xfJq2KuSsFKBldi2A==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/ueberdosis" + }, + "peerDependencies": { + "@tiptap/core": "3.27.3" + } + }, + "node_modules/@tiptap/extension-horizontal-rule": { + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.27.3.tgz", + "integrity": "sha512-sNCuo0+Q001B5XTVWY+ULpWXQqtBNRmAqXxAexZl44bx3rDqHG8OzjwT4EM0LIj2+BYVbdqwaJ1vfQbZVEEbig==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3", + "@tiptap/pm": "3.27.3" } }, "node_modules/@tiptap/extension-image": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.27.2.tgz", - "integrity": "sha512-xnDCj+9oNwr4Zh9B+HHi+9lXyUVYv2KmCF3QuCdGxhZA4FDNlJT3gISwYnH4LNtKSD1XHh/gSCMTpZF+8oqe3g==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.27.3.tgz", + "integrity": "sha512-3OVLRH54Xkh9yrI5oGIempuqZkhLG1plyJBRnapx0N8j9IjEImOLF78kPYoAZzaBuU78M3Zk/E7HQZgmnaNRBg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extension-italic": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.27.2.tgz", - "integrity": "sha512-iAnhS/UbQkk8jioeIMyn98clQGF+6eozrYqABmmzE/lxvYew0PfeNbNnj2poOCZ93USU1pYcf06Kp2Q85wpfwA==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.27.3.tgz", + "integrity": "sha512-7VpVi2vn8kGFAc/HLrt96J/E6+LXOGKn8xLhJS863t150yLIG3EPQLA1h+G5O6eo+/w+9YokvJAAJoeDihj1Jg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extension-link": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.27.2.tgz", - "integrity": "sha512-I3VvI5/J4afMEQbjkcW2sw0ediJMy+Asz46nI2C6cK+qDtGatE9jOZo/rFMG5scTwSx3nrIZkbCcTMTJz1TFEw==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.27.3.tgz", + "integrity": "sha512-iXmu1tJ/3vP60c9d+zfO3+X64vod2EyBrM1qeufecAtWA6t0bT9tYeka0Zq6qDRGsZK5zViO9F2lsY7eHXiYuA==", "license": "MIT", "dependencies": { "linkifyjs": "^4.3.3" @@ -5836,201 +5864,201 @@ "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2", - "@tiptap/pm": "3.27.2" + "@tiptap/core": "3.27.3", + "@tiptap/pm": "3.27.3" } }, "node_modules/@tiptap/extension-list": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.27.2.tgz", - "integrity": "sha512-SsVnh5ruM9QjgOGbhJjegHAIADuoE+9Sb0UV+lyxAeuEwO98JpVmE926Yur9abzUAA9MWZZ/XBIzoA5q0a4dBQ==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.27.3.tgz", + "integrity": "sha512-52rcaSzYjtVGUrNkdB8k1Bw/rId2lBirrWMvmnBLsieoeFd8zo8ow5zkwV057BYSgWXfnMAV7GOpDyq2IoSD9A==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2", - "@tiptap/pm": "3.27.2" + "@tiptap/core": "3.27.3", + "@tiptap/pm": "3.27.3" } }, "node_modules/@tiptap/extension-list-item": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.27.2.tgz", - "integrity": "sha512-k3D6CMZMn5GhxiCLCMizAs1uEXyQOzhR/ySiwqE3SCvz2R1Uvyg68WKcs0j5Mto5OQoD+e1H2SaLFP6+dyez4A==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.27.3.tgz", + "integrity": "sha512-UddhVaQ7+V9IfQVVE8AJLNzSmyaaNpZPQsoPQxFNlJyOFxD6RwSTT8L4rb/TwbUctxSFWpyd1J7exzf33Ony/g==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.2" + "@tiptap/extension-list": "3.27.3" } }, "node_modules/@tiptap/extension-list-keymap": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.27.2.tgz", - "integrity": "sha512-0Iy8+6/LPvD1+wpRr/RnHQ73ykoovjUf6HEw6RFyXDnUWWVnU6YLUNLxMUpuiKQ+k3d/gRRKITrCqghIuqiwJQ==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.27.3.tgz", + "integrity": "sha512-GZPVg4QCFm41yTMPEPeTlH2odNeQwRuWHY/pt3pI5LsfipQ4kDBv6h9we928vJQUnU2Gg9Y3cL5iRbmXIWWTUA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.2" + "@tiptap/extension-list": "3.27.3" } }, "node_modules/@tiptap/extension-ordered-list": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.27.2.tgz", - "integrity": "sha512-AqPDtnwm9QR50BYTC30Pas5fQhRQZvOOBykhbbPefYta8GzSF4sD4L/dSWqitDbZCOTQgL9EbtsJdpmKGF5hJQ==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.27.3.tgz", + "integrity": "sha512-oHYoE65WfRSM5tCcXi8MtQmzPxz83E2qw0pa2yHBKwr9xCCQUu8vJHJE+EJGduWdaNImv43+6/6kVMeYYbXRKg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.2" + "@tiptap/extension-list": "3.27.3" } }, "node_modules/@tiptap/extension-paragraph": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.27.2.tgz", - "integrity": "sha512-On4uQqEbdmV5sgDRisIkLUqrhSEjr38QnIr7Zl2Lvnd4//RGkuJALhyJrZBkHh0VXNMbqPeJ3lL7l/beG1RXDg==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.27.3.tgz", + "integrity": "sha512-G5XPCN7lm0nULYPelJC2eUbKbt1q97j67e/HSWxwMYEXhceec5eNAtVfpDCRyXNO9osyBi2kXqLv/IQtxbch9A==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extension-strike": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.27.2.tgz", - "integrity": "sha512-5trECNOg49bQEWJmxmEHg1KqWaPzCS3FYwU73Cy/XsJuOllTV2MoHP3si+pmSXtDGptpPIumZ6BPE9v2/QqzXw==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.27.3.tgz", + "integrity": "sha512-dp6Rs3I4zLVJPvAw2Q9yrNuYKcX5LTONH3/oyULvGsrqq5DKz7pqscfwhwnDSzrgm/3aCz6B9r1BVHlYI/DXlA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extension-subscript": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-3.27.2.tgz", - "integrity": "sha512-6HHxKOJ57A0RpLawTlCawW58bmBff6rF1+lmamxVK90J0krGLzR//GCqJm9S2lij7wZc+rJ3UoF+hCcZlBZAcw==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-3.27.3.tgz", + "integrity": "sha512-jsnoOWQ40kd7B6NMkdZxsZpcSk/+BevN6TprOVaPbo6cbThjmMCfyL/yCBRTWF/N2KMLMplz1WBhPUEG2Qk3mg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2", - "@tiptap/pm": "3.27.2" + "@tiptap/core": "3.27.3", + "@tiptap/pm": "3.27.3" } }, "node_modules/@tiptap/extension-superscript": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-3.27.2.tgz", - "integrity": "sha512-dy0MtbbR6/4JsUhANsF5O7TXum1LoAZJkHbZK+KZSgXVGtFlfB2GCS1MUg6bBhB3LGhSvF118pR0SxeKF+HTMA==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-3.27.3.tgz", + "integrity": "sha512-y37F/ckFXvCkGVx0hk1qYr0XBXUuBstbwcy1AbW7xzPh07cn8xeTa21j3ytSMaAuSaaKh/TGIj/+DhbnovK8cw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2", - "@tiptap/pm": "3.27.2" + "@tiptap/core": "3.27.3", + "@tiptap/pm": "3.27.3" } }, "node_modules/@tiptap/extension-table": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.27.2.tgz", - "integrity": "sha512-lOuapZby/RgOmrAg5OlTIh/4li8qYhbbTJLKXGq+vCl2BlWLZBMXrhdzPnIqqCiD7mLhNoOPA4kQOohJUah+ww==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.27.3.tgz", + "integrity": "sha512-P7iQ0SkkDWZwnXzQDOVFLXktXlX67VQ3s2YxoJYKTHlc8rPZ4UCaSogFq0G2APyBlizlY3LbMNrDeZAVFOD8wQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2", - "@tiptap/pm": "3.27.2" + "@tiptap/core": "3.27.3", + "@tiptap/pm": "3.27.3" } }, "node_modules/@tiptap/extension-text": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.27.2.tgz", - "integrity": "sha512-ZipAYrdVLtWU/YwdXkSGrW/PJnxqLGtx/GR5f0BSMO/OzxJppSc+5GSu+MEbwlFaptloSKQEHRbkACXDqm4IJg==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.27.3.tgz", + "integrity": "sha512-wSatZ/bop0pleeC18nF90zvWWEoRe/ewZncvm8LjcMrXwq41kTEs3j7nZflMYAh7X8fZvu00UIMeEyCNJl+5Yg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extension-text-align": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.27.2.tgz", - "integrity": "sha512-38MH2LOYzZPbJMFoL+M+NpIUpI2pMefTVRuqlHSNoAdn6wEyJoByEeceRab2vt7/S4w9lWcWxwzsXEa38G/5WQ==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.27.3.tgz", + "integrity": "sha512-yyhlwRz0Eh6xQCn+GtTDWUGqxGajT02Qf8zBN/3eZQtl3EZ2xrI8lvfLmcV9SAW0srgMd+5hX0CVV+zKeXuxeg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extension-text-style": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.27.2.tgz", - "integrity": "sha512-kgGg3LXYnEEttqM6CsiSLxRVU5055vON1T5xipskmbdDtV/xXTykzbISiX3ND5zYw+BG7hF8COEKLt1iLo6LbA==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.27.3.tgz", + "integrity": "sha512-oim4RqFtMBCA4N+J8f8dTFFYZrwyfmXLxLL5SvQkn+kkpfGLv8PqJCnJ4uHxsnHXDNsWHBtVVhfTGUABZsTEHg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extension-underline": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.27.2.tgz", - "integrity": "sha512-5/1XpKxBqAkiR6ND2P/jcPQ06Opcz/Nidd6dasMkjxwuRJPU5OSz3Qy1fsfLlduRU8TzSqjT8vpQJgaqsHqbLA==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.27.3.tgz", + "integrity": "sha512-YH7ka/Rp7ZwlzTuQCcs0OZ4CMSx/P/MzbseQKxKebEIZreWaKMZAaED97Fnu0dA66VlreD4/1C7xHJy84ovamg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2" + "@tiptap/core": "3.27.3" } }, "node_modules/@tiptap/extensions": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.27.2.tgz", - "integrity": "sha512-WPmMf6+CXEgVpsxFGj20DYLt0gNU2zBATmxSPN5L+sDUx3gKXVjFtQxhKvrhaba5ubO45rIV1hJdo0AGu9TmBA==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.27.3.tgz", + "integrity": "sha512-IA2QKUVJgzUPEhhkUfr6P5u5GFVfhiApiEaaHXBz07saL2c4HNoVs2RC18QlZDCtLNKrPR1mUScr72u7uYs+YQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.2", - "@tiptap/pm": "3.27.2" + "@tiptap/core": "3.27.3", + "@tiptap/pm": "3.27.3" } }, "node_modules/@tiptap/pm": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.27.2.tgz", - "integrity": "sha512-4eBV9Fx16ZZUJuO4AvHzykxdYXfF/iMjpoI8q9PHvxOe+xx8tNa4ONhZMKJLpgCKEECJiBkQmr0gOmarzB0MtA==", + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.27.3.tgz", + "integrity": "sha512-ppiG57RxM3HSHHgcHT0hP6Ib4P56Sd5itxdV4w0hIGHKPGyLLKiAkYp+htIHa9T7IvjMdaqxIlsfyV3ZKsS1sw==", "license": "MIT", "dependencies": { "prosemirror-changeset": "^2.4.1", @@ -6053,69 +6081,41 @@ } }, "node_modules/@tiptap/starter-kit": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.27.2.tgz", - "integrity": "sha512-X28UrkkJPli8f2eCRkpaxE0PDbpwKNCxKrHE6tH40hHtd7SG4zgMw0bBmNYa9o+DJGc5dXipjK6sSc+2sud3cg==", - "license": "MIT", - "dependencies": { - "@tiptap/core": "^3.27.2", - "@tiptap/extension-blockquote": "^3.27.2", - "@tiptap/extension-bold": "^3.27.2", - "@tiptap/extension-bullet-list": "^3.27.2", - "@tiptap/extension-code": "^3.27.2", - "@tiptap/extension-code-block": "^3.27.2", - "@tiptap/extension-document": "^3.27.2", - "@tiptap/extension-dropcursor": "^3.27.2", - "@tiptap/extension-gapcursor": "^3.27.2", - "@tiptap/extension-hard-break": "^3.27.2", - "@tiptap/extension-heading": "^3.27.2", - "@tiptap/extension-horizontal-rule": "^3.27.2", - "@tiptap/extension-italic": "^3.27.2", - "@tiptap/extension-link": "^3.27.2", - "@tiptap/extension-list": "^3.27.2", - "@tiptap/extension-list-item": "^3.27.2", - "@tiptap/extension-list-keymap": "^3.27.2", - "@tiptap/extension-ordered-list": "^3.27.2", - "@tiptap/extension-paragraph": "^3.27.2", - "@tiptap/extension-strike": "^3.27.2", - "@tiptap/extension-text": "^3.27.2", - "@tiptap/extension-underline": "^3.27.2", - "@tiptap/extensions": "^3.27.2", - "@tiptap/pm": "^3.27.2" + "version": "3.27.3", + "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.27.3.tgz", + "integrity": "sha512-xX3baFqiC30skntdhxUUvyJo755ON9c1pE83+2Wiq2g+Qnffg9knUuLCZStHoZZ318yB0aBsKAMvHWLtYDo8AA==", + "license": "MIT", + "dependencies": { + "@tiptap/core": "^3.27.3", + "@tiptap/extension-blockquote": "^3.27.3", + "@tiptap/extension-bold": "^3.27.3", + "@tiptap/extension-bullet-list": "^3.27.3", + "@tiptap/extension-code": "^3.27.3", + "@tiptap/extension-code-block": "^3.27.3", + "@tiptap/extension-document": "^3.27.3", + "@tiptap/extension-dropcursor": "^3.27.3", + "@tiptap/extension-gapcursor": "^3.27.3", + "@tiptap/extension-hard-break": "^3.27.3", + "@tiptap/extension-heading": "^3.27.3", + "@tiptap/extension-horizontal-rule": "^3.27.3", + "@tiptap/extension-italic": "^3.27.3", + "@tiptap/extension-link": "^3.27.3", + "@tiptap/extension-list": "^3.27.3", + "@tiptap/extension-list-item": "^3.27.3", + "@tiptap/extension-list-keymap": "^3.27.3", + "@tiptap/extension-ordered-list": "^3.27.3", + "@tiptap/extension-paragraph": "^3.27.3", + "@tiptap/extension-strike": "^3.27.3", + "@tiptap/extension-text": "^3.27.3", + "@tiptap/extension-underline": "^3.27.3", + "@tiptap/extensions": "^3.27.3", + "@tiptap/pm": "^3.27.3" }, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" } }, - "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-code-block": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.27.2.tgz", - "integrity": "sha512-RlrQdRLIHapi3YDYzNJa1cWnpM9aynGPoqmoEk3qdyOrXO/FFBQk/tUy+IsxZhaNSnuYPo/5cgzwG2z6Ofa9Sw==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "3.27.2", - "@tiptap/pm": "3.27.2" - } - }, - "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-horizontal-rule": { - "version": "3.27.2", - "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.27.2.tgz", - "integrity": "sha512-kuDRRmV5Hz/S6eYh5DRtG6RwbQdbThMEOs65d9MjLyNdJi+o9LMtmEm1Bd3ZLYRuIDKbdaNyXe8D6auGzsPHuQ==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "3.27.2", - "@tiptap/pm": "3.27.2" - } - }, "node_modules/@ts-morph/common": { "version": "0.29.0", "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.29.0.tgz", diff --git a/client/package.json b/client/package.json index 88ecab3c3b..f09044f04d 100644 --- a/client/package.json +++ b/client/package.json @@ -54,20 +54,20 @@ "@ngx-translate/core": "^17.0.0", "@ngx-translate/http-loader": "^17.0.0", "@openslides/motion-diff": "file:../packages/openslides-motion-diff", - "@tiptap/core": "^3.27.2", - "@tiptap/extension-color": "^3.27.2", - "@tiptap/extension-highlight": "^3.27.2", - "@tiptap/extension-image": "^3.27.2", + "@tiptap/core": "^3.27.3", + "@tiptap/extension-color": "^3.27.3", + "@tiptap/extension-highlight": "^3.27.3", + "@tiptap/extension-image": "^3.27.3", "@tiptap/extension-link": "^3.23.4", "@tiptap/extension-list": "^3.22.4", - "@tiptap/extension-subscript": "^3.27.2", - "@tiptap/extension-superscript": "^3.27.2", - "@tiptap/extension-table": "^3.27.2", - "@tiptap/extension-text-align": "^3.27.2", + "@tiptap/extension-subscript": "^3.27.3", + "@tiptap/extension-superscript": "^3.27.3", + "@tiptap/extension-table": "^3.27.3", + "@tiptap/extension-text-align": "^3.27.3", "@tiptap/extension-text-style": "^3.4.2", "@tiptap/extensions": "^3.22.4", - "@tiptap/pm": "^3.27.1", - "@tiptap/starter-kit": "^3.27.2", + "@tiptap/pm": "^3.27.3", + "@tiptap/starter-kit": "^3.27.3", "@tsparticles/angular": "^3.0.0", "@tsparticles/engine": "^3.9.1", "@tsparticles/plugin-emitters": "^3.9.1", From 05fd86533e5075794f641b90169ca244516fc917 Mon Sep 17 00:00:00 2001 From: Loki Elble <69210919+Elblinator@users.noreply.github.com> Date: Mon, 13 Jul 2026 10:02:36 +0200 Subject: [PATCH 44/71] Clean up os-list-search-selector (#6386) --- .../agenda-content-object-form.component.html | 1 - .../participant-search-selector.component.html | 1 - .../history/components/history-list/history-list.component.html | 1 - .../participant-detail-edit.component.html | 2 -- .../participant-list-info-dialog.component.html | 1 - .../components/account-detail/account-detail.component.html | 1 - .../committee-detail-edit/committee-detail-edit.component.html | 1 - .../components/meeting-edit/meeting-edit.component.html | 2 -- .../media-upload-content/media-upload-content.component.html | 1 - .../base-search-selector/base-search-selector.component.ts | 1 - 10 files changed, 12 deletions(-) diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/components/agenda-content-object-form/agenda-content-object-form.component.html b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/components/agenda-content-object-form/agenda-content-object-form.component.html index c2756ad14c..e0ae1020f6 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/components/agenda-content-object-form/agenda-content-object-form.component.html +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/components/agenda-content-object-form/agenda-content-object-form.component.html @@ -31,7 +31,6 @@ formControlName="agenda_parent_id" [includeNone]="true" [inputListValues]="itemObserver" - [multiple]="false" >

diff --git a/client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.html b/client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.html index 8f7a7d608a..e52b77f355 100644 --- a/client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.html +++ b/client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.html @@ -6,7 +6,6 @@ formControlName="userId" [excludeIds]="true" [inputListValues]="filteredUsersSubject" - [multiple]="false" [sortFn]="false" (clickNotFound)="createNewSelectedUser($event)" > diff --git a/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.html b/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.html index 103c945c38..81c0eaf9cd 100644 --- a/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.html +++ b/client/src/app/site/pages/meetings/pages/history/components/history-list/history-list.component.html @@ -26,7 +26,6 @@

History

formControlName="id" [disabled]="!modelSelectForm.get('collection').value" [inputListValues]="models" - [multiple]="false" (openedChange)="resetListValues($event)" > diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-edit/participant-detail-edit.component.html b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-edit/participant-detail-edit.component.html index fbe972f195..b33b3defbd 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-edit/participant-detail-edit.component.html +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-edit/participant-detail-edit.component.html @@ -135,7 +135,6 @@

{{ 'Meeting specific information' | translate }}

{{ 'Organization specific information' | translate }}

formControlName="home_committee_id" [disabled]="!canManageHomeCommittee" [includeNone]="true" - [multiple]="false" [repo]="committeeController" [sortService]="committeeSortService" [subscriptionConfig]="committeeSubscriptionConfig" diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html index 8f11c9fc58..e4467a8058 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.html @@ -29,7 +29,6 @@

diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.html b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.html index 26a2fcf6f1..2d71172f5d 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.html +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.html @@ -50,7 +50,6 @@

{{ 'Organization specific information' | translate }}

formControlName="parent_id" [disableOptionWhenFn]="getDisableOptionForCommitteeParentFn()" [includeNone]="isOrgaManager && isCreateView" - [multiple]="false" [repo]="committeeRepo" [required]="!isOrgaManager && isCreateView" [showChips]="false" diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html index 13d777916a..0ef0346973 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html @@ -70,8 +70,6 @@

formControlName="time_zone" [getAdditionallySearchedValuesFn]="getAdditionallySearchedValuesFn" [inputListValues]="time_zones" - [keepOpen]="false" - [multiple]="false" > diff --git a/client/src/app/ui/modules/media-upload-content/media-upload-content.component.html b/client/src/app/ui/modules/media-upload-content/media-upload-content.component.html index 10319e63bd..eed7ea1032 100644 --- a/client/src/app/ui/modules/media-upload-content/media-upload-content.component.html +++ b/client/src/app/ui/modules/media-upload-content/media-upload-content.component.html @@ -14,7 +14,6 @@ formControlName="directoryId" [includeNone]="true" [inputListValues]="directories" - [multiple]="false" /> diff --git a/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts b/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts index e6865bb957..101778be75 100644 --- a/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts +++ b/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts @@ -85,7 +85,6 @@ export abstract class BaseSearchSelectorComponent /** * Label showing, if there are no options for a specific search. */ - @Input() public noOptionsFoundLabel = _(`No options found`); /** From c548aa3d00f251d1ef3c558362e2dd1aada40a92 Mon Sep 17 00:00:00 2001 From: Ludwig Reiter Date: Mon, 13 Jul 2026 15:41:53 +0200 Subject: [PATCH 45/71] Add another case to determine ChReco (#6384) --- .../components/motion-view/motion-view.component.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts index 7090a37f46..95bfd06034 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts @@ -595,6 +595,16 @@ export class MotionViewComponent extends BaseMeetingComponent implements OnInit, * the regular amendment changes are shown in the "original" view. */ return ChangeRecoMode.Original; + } else if ( + mode === ChangeRecoMode.Original && + this.hasChangeRecommendations && + this.motion?.isParagraphBasedAmendment() + ) { + /** + * Paragraph-based amendments with change recommendations should display + * the Diff view. + */ + return ChangeRecoMode.Diff; } return mode; } From e8dcb5fe2cb35d1d860d849a06239be464d8e5b7 Mon Sep 17 00:00:00 2001 From: Ludwig Reiter Date: Mon, 13 Jul 2026 15:48:01 +0200 Subject: [PATCH 46/71] Motion export: sanitize filename (#6385) --- .../pdf-document.service/pdf-document.service.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/client/src/app/gateways/export/pdf-document.service/pdf-document.service.ts b/client/src/app/gateways/export/pdf-document.service/pdf-document.service.ts index f993498607..d608d597ff 100644 --- a/client/src/app/gateways/export/pdf-document.service/pdf-document.service.ts +++ b/client/src/app/gateways/export/pdf-document.service/pdf-document.service.ts @@ -570,7 +570,7 @@ export class PdfDocumentService { landscape: false, imageUrls: imageUrls }), - filename: `${filetitle}.pdf`, + filename: `${this.sanitizeFilename(filetitle)}.pdf`, settings: this.settings, loadImages: (): Promise => this.loadImages(), progressService: null, @@ -590,7 +590,7 @@ export class PdfDocumentService { progressService: this.progressService }); if (file) { - saveAs(file, config.filename, { autoBom: true }); + saveAs(file, this.sanitizeFilename(config.filename), { autoBom: true }); } } @@ -607,7 +607,7 @@ export class PdfDocumentService { pageMargins: [50, 80, 50, 75], landscape: true }), - filename: `${filetitle}.pdf`, + filename: `${this.sanitizeFilename(filetitle)}.pdf`, settings: this.settings, loadImages: (): Promise => this.loadImages(), progressService: this.progressService, @@ -1078,4 +1078,8 @@ export class PdfDocumentService { .mapToObject((url, index) => ({ [url]: atob(svgs[index].data) })) }; } + + private sanitizeFilename(value: string): string { + return value.replace(/[^a-zA-Z0-9_-üöäÜÖħ\s]/g, '_'); + } } From 82cfcbd5aa19baa607c96ab55c37948f902dd20a Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Tue, 14 Jul 2026 11:40:28 +0200 Subject: [PATCH 47/71] Angular 22 (#6392) --- client/angular.json | 7 +- client/cli/generate-permissions.ts | 2 +- client/cli/generate-settings-defaults.ts | 2 +- client/cli/get-available-languages.ts | 2 +- client/cli/tsconfig.json | 4 +- client/eslint.config.mjs | 1 + client/package-lock.json | 3171 +++++++---------- client/package.json | 60 +- client/src/app/domain/fieldsets/misc.ts | 2 +- client/src/app/domain/fieldsets/user.ts | 2 +- .../app/domain/interfaces/constructable.ts | 2 +- .../src/app/domain/interfaces/has-owner-id.ts | 2 +- .../src/app/domain/interfaces/has-poll-ids.ts | 2 +- .../domain/interfaces/subscription-config.ts | 6 +- .../app/domain/models/mediafiles/mediafile.ts | 2 +- .../models/organizations/organization.ts | 2 +- .../app/domain/models/poll/generic-poll.ts | 10 +- client/src/app/domain/models/poll/poll.ts | 2 +- .../models/projector/projector-countdown.ts | 2 +- client/src/app/domain/models/topics/topic.ts | 2 +- .../action-worker-watch.service.spec.ts | 24 +- .../action-worker-watch.service.ts | 12 +- .../action-worker-watch.subscription.ts | 6 +- .../gateways/actions/action.service.spec.ts | 2 +- .../error-mapping/error-map.service.spec.ts | 2 +- .../csv-export-for-backend.service.spec.ts | 2 +- .../csv-export-for-backend.service.ts | 2 +- .../file-export.service.ts | 2 +- .../html-to-pdf.service.spec.ts | 2 +- .../html-to-pdf.service.ts | 2 +- .../pdf-document.service.ts | 12 +- .../progress-snack-bar.module.ts | 2 +- .../http-stream-endpoint.service.spec.ts | 2 +- .../export-meeting-presenter.service.ts | 2 +- ...forwarding-committees-presenter.service.ts | 2 +- ...t-forwarding-meetings-presenter.service.ts | 2 +- .../get-user-editable-presenter.service.ts | 2 +- ...r-related-models-presenter.service.spec.ts | 2 +- .../get-user-scope-presenter.service.spec.ts | 4 +- .../get-user-scope-presenter.service.ts | 6 +- .../search-users-presenter.service.spec.ts | 2 +- .../search-users-presenter.service.ts | 8 +- .../action-worker-repository.service.ts | 2 +- .../action-worker/action-worker.config.ts | 4 +- .../action-worker/view-action-worker.ts | 4 +- .../agenda/agenda-item-repository.service.ts | 14 +- ...assignment-candidate-repository.service.ts | 12 +- .../assignment-repository.service.ts | 10 +- ...t-of-speakers-content-object-repository.ts | 8 +- ...e-agenda-item-content-object-repository.ts | 8 +- ...t-of-speakers-content-object-repository.ts | 8 +- .../base-meeting-related-repository.ts | 2 +- .../gateways/repositories/base-repository.ts | 14 +- .../chat-group-repository.service.ts | 8 +- .../chat-message-repository.service.ts | 8 +- .../committee-repository.service.ts | 6 +- .../gender/gender-repository.service.ts | 12 +- .../groups/group-repository.service.ts | 10 +- .../history-entry/has-history-entries.ts | 2 +- .../history-entry-repository.service.ts | 2 +- .../history-entry/view-history-entry.ts | 12 +- .../history-position-repository.service.ts | 2 +- .../history-position/view-history-position.ts | 6 +- .../list-of-speakers-repository.service.ts | 6 +- .../mediafile-repository.service.ts | 16 +- .../meeting-mediafile-repository.service.ts | 6 +- .../meeting-repository.service.ts | 4 +- .../meeting_user/meeting-user-config.ts | 6 +- .../meeting-user-repository.service.ts | 10 +- .../motion-block-repository.service.ts | 4 +- .../motion-category-repository.service.ts | 12 +- ...hange-recommendation-repository.service.ts | 6 +- .../motion-comment-repository.service.ts | 6 +- ...tion-comment-section-repository.service.ts | 6 +- .../motion-editor-repository.service.ts | 2 +- .../motion-repository.service.ts | 18 +- .../motion-state-repository.service.ts | 8 +- .../motion-submitter-repository.service.ts | 2 +- .../motion-supporter-repository.service.ts | 6 +- .../motion-workflow-repository.service.ts | 10 +- ...orking-group-speaker-repository.service.ts | 2 +- .../personal-note-repository.service.ts | 12 +- .../app/gateways/repositories/motions/util.ts | 8 +- .../organization-repository.service.ts | 2 +- .../organization-tag-repository.service.ts | 2 +- ...nt-of-order-category-repository.service.ts | 10 +- .../poll-candidate-list-repository.service.ts | 6 +- .../poll-candidate-repository.service.ts | 6 +- .../option-repository.service.ts | 4 +- .../poll-repository.service.ts | 14 +- .../vote-repository.service.ts | 10 +- .../projection-repository.service.ts | 8 +- .../projector-countdown-repository.service.ts | 6 +- .../projector-message-repository.service.ts | 6 +- .../projector-repository.service.ts | 10 +- ...-meeting-service-collector.service.spec.ts | 14 +- .../speakers/speaker-repository.service.ts | 12 +- ...vel-list-of-speakers-repository.service.ts | 8 +- .../structure-level-repository.service.ts | 2 +- .../tags/tag-repository.service.ts | 6 +- .../themes/theme-repository.service.ts | 12 +- .../topics/topic-repository.service.ts | 10 +- .../users/user-repository.service.ts | 18 +- .../app/gateways/server-time.service.spec.ts | 2 +- .../src/app/gateways/server-time.service.ts | 2 +- .../annotations/data-transaction.ts | 2 +- .../infrastructure/definitions/app-config.ts | 8 +- .../definitions/relations/relations.ts | 34 +- .../infrastructure/utils/functions.spec.ts | 2 +- .../src/app/infrastructure/utils/functions.ts | 6 +- .../utils/import/import-model.ts | 2 +- .../utils/import/import-repository.ts | 2 +- .../utils/import/import-utils.ts | 2 +- .../utils/import/json-import-file-utils.ts | 2 +- .../import/static-before-import-config.ts | 2 +- .../import/static-before-import-handler.ts | 2 +- .../utils/import/users/user-import-helper.ts | 10 +- .../utils/subscription-map.spec.ts | 2 +- .../openslides-main.component.ts | 37 +- .../openslides-overlay-container.component.ts | 7 +- .../openslides-main.module.ts | 8 +- .../services/app-load.service.ts | 44 +- .../services/shared-worker.service.ts | 10 +- .../base-filter-list.service.ts | 6 +- .../base-backend-import.service.ts | 14 +- .../app/site/base/base-list-view.component.ts | 9 +- .../base-model-request-handler.component.ts | 6 +- .../base-sort-list.service.ts | 12 +- .../base-sort.service/base-sort.service.ts | 6 +- .../base-via-backend-import-list.component.ts | 4 +- client/src/app/site/base/base-view-model.ts | 2 +- client/src/app/site/base/base.component.ts | 4 +- .../chip-select-chip.component.ts | 3 +- .../chip-select/chip-select.component.ts | 3 +- .../account-button.component.ts | 33 +- .../account-dialog-main.component.ts | 7 +- .../account-dialog.component.ts | 25 +- .../global-headbar.component.ts | 9 +- .../global-search.component.html | 4 +- .../global-search/global-search.component.ts | 14 +- .../global-headbar/global-headbar.module.ts | 8 +- .../global-spinner.component.ts | 9 +- .../global-spinner/definitions/index.ts | 2 +- .../global-spinner/global-spinner.module.ts | 4 +- .../services/spinner.service.ts | 8 +- .../info-actions/info-actions.component.ts | 7 +- .../legal-notice-content.component.ts | 9 +- .../privacy-policy-content.component.ts | 9 +- .../src/app/site/modules/info/info.module.ts | 10 +- .../components/banner/banner.component.ts | 5 +- .../site-wrapper/site-wrapper.component.ts | 15 +- .../site-wrapper/services/banner.service.ts | 2 +- .../services/site-wrapper-service.module.ts | 2 +- .../site-wrapper/services/update.service.ts | 2 +- .../services/voting-banner.service.ts | 20 +- .../site-wrapper/site-wrapper.module.ts | 4 +- .../password-form/password-form.component.ts | 5 +- .../user-delete-dialog.component.ts | 9 +- .../user-detail-view.component.html | 2 +- .../user-detail-view.component.ts | 12 +- .../user-multiselect-actions.component.ts | 12 +- .../user-password-form.component.ts | 3 +- .../services/user-delete-dialog.service.ts | 10 +- .../user-components/user-components.module.ts | 4 +- ...ped-waiting-for-action-dialog.component.ts | 5 +- .../wait-for-action-banner.component.ts | 2 +- .../wait-for-action-dialog.service.ts | 10 +- .../error-main/error-main.component.ts | 9 +- .../src/app/site/pages/error/error.module.ts | 2 +- .../login-wrapper/login-wrapper.component.ts | 5 +- .../login-wrapper/login-wrapper.module.ts | 2 +- .../legal-notice/legal-notice.component.ts | 3 +- .../pages/legal-notice/legal-notice.module.ts | 4 +- .../login-mask/login-mask.component.ts | 29 +- .../pages/login-mask/login-mask.module.ts | 6 +- .../privacy-policy.component.ts | 3 +- .../privacy-policy/privacy-policy.module.ts | 4 +- .../reset-password-confirm.component.ts | 9 +- .../reset-password-confirm.module.ts | 2 +- .../reset-password.component.ts | 9 +- .../reset-password/reset-password.module.ts | 4 +- .../unsupported-browser.component.ts | 3 +- .../unsupported-browser.module.ts | 2 +- .../base/base-has-meeting-user-view-model.ts | 4 +- .../base/base-meeting-controller.service.ts | 14 +- .../base/base-meeting-list-view.component.ts | 12 +- ...meeting-model-request-handler.component.ts | 6 +- .../meetings/base/base-meeting.component.ts | 6 +- .../site/pages/meetings/meetings.config.ts | 2 +- .../list-of-speakers-content.component.ts | 28 +- .../list-of-speakers-entry.component.ts | 24 +- .../moderation-note.component.ts | 12 +- .../speaking-times.component.spec.ts | 2 +- .../speaking-times.component.ts | 18 +- .../list-of-speakers-content.module.ts | 12 +- .../list-of-speakers-content.subscription.ts | 4 +- .../point-of-order-dialog.component.ts | 9 +- .../point-of-order-dialog.module.ts | 2 +- .../services/point-of-order-dialog.service.ts | 6 +- .../speaker-user-select-dialog.component.ts | 11 +- .../speaker-user-select-dialog.service.ts | 10 +- .../speaker-user-select-dialog.module.ts | 2 +- .../moderation-note-pdf.service.ts | 4 +- .../agenda-content-object-form.module.ts | 6 +- .../agenda-content-object-form.component.ts | 17 +- .../agenda-content-object-form.service.ts | 4 +- .../attachment-control.module.ts | 10 +- .../attachment-control.component.ts | 22 +- .../detail-view-navigator.component.ts | 7 +- .../detail-view-not-found.component.ts | 3 +- .../detail-view/detail-view.component.ts | 8 +- .../easter-egg/easter-egg.component.ts | 5 +- .../projectable-title.component.ts | 4 +- .../detail-view/detail-view.module.ts | 4 +- .../projectable-list.component.spec.ts | 2 +- .../projectable-list.component.ts | 23 +- .../projectable-list.module.ts | 6 +- .../services/projectable-list.service.ts | 6 +- .../projection-dialog.component.ts | 21 +- .../projection-dialog/definitions.ts | 4 +- .../projection-dialog.module.ts | 4 +- .../services/projection-dialog.service.ts | 6 +- .../projector-button.component.ts | 15 +- .../projector-button.module.ts | 4 +- .../speaker-button.component.ts | 8 +- .../speaker-button/speaker-button.module.ts | 4 +- .../meetings-navigation-wrapper.component.ts | 27 +- .../participant-search-selector.component.ts | 9 +- .../participant-search-selector/index.ts | 2 +- .../participant-search-selector.module.ts | 6 +- .../poll/base/base-poll-detail.component.ts | 28 +- .../poll/base/base-poll-dialog.component.ts | 18 +- .../poll/base/base-poll-dialog.service.ts | 10 +- .../base-poll-meta-information.component.ts | 4 +- .../poll/base/base-poll-pdf.service.ts | 20 +- .../modules/poll/base/base-poll.component.ts | 14 +- .../base-poll-form.component.ts | 10 +- .../base-poll-vote.component.ts | 22 +- .../poll/components/chart/chart.component.ts | 3 +- .../check-input/check-input.component.ts | 5 +- .../entitled-users-table.component.ts | 2 +- .../poll-cannot-vote-message.component.ts | 2 +- .../poll-filtered-votes-chart.component.ts | 6 +- .../poll-progress/poll-progress.component.ts | 14 +- .../single-option-chart-table.component.ts | 7 +- .../votes-table/votes-table.component.ts | 4 +- .../definitions/entitled-users-table-entry.ts | 6 +- .../poll/definitions/poll-dialog-data.ts | 6 +- ...voting-privacy-warning-dialog.component.ts | 3 +- .../voting-privacy-warning-dialog.service.ts | 4 +- .../voting-privacy-dialog.module.ts | 2 +- .../poll-key-verbose/poll-key-verbose.pipe.ts | 2 +- .../poll-percent-base.pipe.spec.ts | 4 +- .../poll-percent-base.pipe.ts | 4 +- .../meetings/modules/poll/poll.module.ts | 10 +- .../services/entitled-user-filter.service.ts | 4 +- .../poll-controller.service.ts | 18 +- .../poll-dialog.service.ts | 2 +- .../services/poll.service/poll.service.ts | 16 +- .../vote-controller.service.ts | 12 +- .../poll/services/votes-filter.service.ts | 4 +- .../services/voting.service/voting.service.ts | 8 +- .../projector/projector.component.ts | 19 +- .../countdown-time.component.ts | 2 +- .../modules/projector/projector.module.ts | 4 +- .../pages/agenda/agenda-routing.module.ts | 2 +- .../meetings/pages/agenda/agenda.config.ts | 28 +- .../pages/agenda/agenda.subscription.ts | 12 +- .../agenda-forward-dialog.component.ts | 13 +- .../services/agenda-forward-dialog.service.ts | 24 +- .../agenda-main/agenda-main.component.ts | 9 +- .../list-of-speakers-main.component.ts | 11 +- .../list-of-speakers.component.ts | 21 +- .../list-of-speakers.module.ts | 10 +- .../current-list-of-speakers-slide.service.ts | 8 +- ...-speaking-structure-level-slide.service.ts | 8 +- ...rent-structure-level-list-slide.service.ts | 8 +- .../list-of-speakers-controller.service.ts | 14 +- ...nt-of-order-category-controller.service.ts | 8 +- .../services/speaker-controller.service.ts | 16 +- .../view-models/has-list-of-speakers.ts | 4 +- .../view-models/view-list-of-speakers.ts | 18 +- .../view-point-of-order-category.ts | 6 +- .../view-models/view-speaker.ts | 12 +- .../topic-poll-detail-content.component.ts | 10 +- .../topic-poll-dialog.component.ts | 26 +- .../topic-poll-form.component.ts | 5 +- .../topic-poll-meta-info.component.ts | 9 +- .../topic-poll-vote.component.ts | 14 +- .../topic-poll/topic-poll.component.html | 2 +- .../topic-poll/topic-poll.component.ts | 15 +- .../services/topic-poll-dialog.service.ts | 2 +- .../topic-poll-pdf.service.ts | 7 +- .../services/topic-poll-service.module.ts | 4 +- .../topic-poll/services/topic-poll.service.ts | 20 +- .../modules/topic-poll/topic-poll.module.ts | 22 +- .../topic-detail-main.component.ts | 11 +- .../topic-detail/topic-detail.component.html | 2 +- .../topic-detail/topic-detail.component.ts | 39 +- .../pages/topic-detail/topic-detail.module.ts | 20 +- .../topic-import-main.component.ts | 9 +- .../topic-import/topic-import.component.ts | 11 +- .../topic-export.service.ts | 2 +- .../services/topic-import-service.module.ts | 2 +- .../topic-import.service.ts | 12 +- .../pages/topic-import/topic-import.module.ts | 8 +- .../pages/topics-pages-routing.module.ts | 4 +- .../services/topic-common-service.module.ts | 2 +- .../topic-controller.service.ts | 12 +- .../topic-pdf.service/topic-pdf.service.ts | 6 +- .../modules/topics/view-models/view-topic.ts | 14 +- .../agenda-export/agenda-export.component.ts | 24 +- .../agenda-item-list.module.ts | 16 +- .../agenda-item-info-dialog.component.ts | 7 +- .../agenda-item-list.component.ts | 45 +- .../agenda-item-export.service.ts | 6 +- .../agenda-item-filter.service.ts | 16 +- .../agenda-item-list-service.module.ts | 2 +- .../agenda-item-multiselect.service.ts | 6 +- .../agenda-sort/agenda-sort-routing.module.ts | 2 +- .../pages/agenda-sort/agenda-sort.module.ts | 6 +- .../agenda-sort/agenda-sort.component.ts | 13 +- .../agenda-item-controller.service.ts | 20 +- .../agenda-pdf-catalog-export.service.ts | 10 +- .../agenda/view-models/has-agenda-item.ts | 2 +- .../agenda/view-models/view-agenda-item.ts | 20 +- .../pages/assignments/assignments.config.ts | 12 +- .../assignments/assignments.subscription.ts | 10 +- .../assignment-main.component.ts | 9 +- .../pages/assignments/definitions/index.ts | 2 +- .../assignment-poll/assignment-poll.module.ts | 26 +- ...ssignment-poll-detail-content.component.ts | 22 +- .../assignment-poll-dialog.component.ts | 15 +- .../assignment-poll-form.component.ts | 9 +- .../assignment-poll-meta-info.component.ts | 11 +- .../assignment-poll-vote.component.ts | 18 +- .../assignment-poll.component.ts | 13 +- .../assignment-poll-dialog.service.ts | 4 +- .../assignment-poll-pdf.service.ts | 11 +- .../assignment-poll-service.module.ts | 4 +- .../services/assignment-poll.service.ts | 20 +- .../assignment-detail.module.ts | 20 +- .../assignment-detail.component.ts | 41 +- ...assignment-candidate-controller.service.ts | 16 +- .../assignment-list/assignment-list.module.ts | 8 +- .../assignment-list.component.ts | 14 +- .../assignment-filter-list.service.ts | 4 +- .../services/assignment-sort-list.service.ts | 8 +- .../assignment-polls.module.ts | 10 +- .../assignment-poll-detail.component.ts | 12 +- .../assignment-poll-main.component.ts | 9 +- .../services/assignment-controller.service.ts | 12 +- .../assignment-export-service.module.ts | 2 +- .../services/assignment-export.service.ts | 6 +- .../services/assignment-pdf.service.ts | 8 +- .../view-models/view-assignment-candidate.ts | 2 +- .../view-models/view-assignment.ts | 14 +- .../pages/autopilot/autopilot.config.ts | 4 +- .../pages/autopilot/autopilot.module.ts | 14 +- .../pages/autopilot/autopilot.subscription.ts | 10 +- .../autopilot-main.component.ts | 15 +- .../autopilot/autopilot.component.ts | 15 +- .../poll-collection.component.spec.ts | 2 +- .../poll-collection.component.ts | 23 +- .../autopilot/services/autopilot.service.ts | 2 +- .../pages/meetings/pages/chat/chat.config.ts | 10 +- .../chat-group-dialog.module.ts | 4 +- .../chat-group-dialog.component.ts | 3 +- .../services/chat-group-dialog.service.ts | 6 +- .../chat-group-list/chat-group-list.module.ts | 12 +- ...hat-group-detail-message-form.component.ts | 13 +- .../chat-group-detail-message.component.ts | 13 +- .../chat-group-detail.component.ts | 16 +- .../chat-group-list.component.ts | 12 +- .../services/chat-group-controller.service.ts | 10 +- .../chat-message-controller.service.ts | 10 +- .../services/chat-notification.service.ts | 4 +- .../pages/chat/services/chat.service.ts | 8 +- .../history-list/history-list.component.ts | 43 +- .../history-main/history-main.component.ts | 7 +- .../meetings/pages/history/history.config.ts | 16 +- .../meetings/pages/history/history.module.ts | 8 +- .../pages/home/home-routing.module.ts | 4 +- .../pages/meetings/pages/home/home.config.ts | 4 +- .../count-users/count-users.component.ts | 5 +- .../meeting-info/meeting-info.component.ts | 13 +- .../user-statistics.component.ts | 8 +- .../pages/meeting-info/meeting-info.module.ts | 12 +- .../count-users-statistics.service.ts | 6 +- .../start/components/start/start.component.ts | 13 +- .../pages/home/pages/start/start.module.ts | 8 +- .../modules/action-bar/action-bar.module.ts | 4 +- .../action-bar/action-bar.component.ts | 6 +- .../applause-bar-display.component.ts | 4 +- .../applause-particle-display.component.ts | 9 +- .../call-dialog/call-dialog.component.ts | 4 +- .../components/call/call.component.ts | 2 +- .../interaction-container.component.ts | 2 +- .../components/progress/progress.component.ts | 3 +- .../components/stream/stream.component.ts | 2 +- .../video-player/video-player.component.ts | 4 +- .../interaction-container.module.ts | 6 +- .../interaction/services/applause.service.ts | 10 +- .../services/call-restriction.service.ts | 4 +- .../services/interaction-receive.service.ts | 4 +- .../services/interaction-service.module.ts | 2 +- .../services/interaction.service.ts | 8 +- .../operator-media-permission.service.ts | 2 +- .../pages/interaction/services/rtc.service.ts | 2 +- .../interaction/services/stream.service.ts | 4 +- .../mediafile-delete-dialog.component.ts | 3 +- .../mediafile-main.component.ts | 7 +- .../mediafiles/mediafiles-routing.module.ts | 4 +- .../pages/mediafiles/mediafiles.config.ts | 8 +- .../mediafiles/mediafiles.subscription.ts | 6 +- .../mediafiles/meeting-mediafiles.config.ts | 6 +- .../mediafile-list.component.html | 2 +- .../mediafile-list.component.ts | 37 +- .../mediafile-list/mediafile-list.module.ts | 18 +- .../mediafile-list-export.service.ts | 6 +- .../mediafile-list-group.service.ts | 2 +- .../services/mediafile-list-service.module.ts | 2 +- .../mediafile-upload.component.ts | 11 +- .../mediafile-upload.module.ts | 10 +- .../services/mediafile-common.service.ts | 4 +- .../services/mediafile-controller.service.ts | 16 +- .../mediafiles/view-models/has-attachment.ts | 2 +- .../mediafiles/view-models/view-mediafile.ts | 14 +- .../view-models/view-meeting-mediafile.ts | 8 +- .../meeting-settings.config.ts | 4 +- ...g-settings-group-detail-field.component.ts | 16 +- ...ng-settings-group-detail-main.component.ts | 5 +- ...meeting-settings-group-detail.component.ts | 32 +- ...ng-settings-group-detail-routing.module.ts | 2 +- .../meeting-settings-group-detail.module.ts | 16 +- .../meeting-settings-group-list.component.ts | 15 +- .../meeting-settings-group-list.module.ts | 8 +- .../motion-editor/motion-editor.component.ts | 9 +- .../motion-forward-dialog.component.ts | 11 +- .../motion-forward-dialog.module.ts | 8 +- .../services/motion-forward-dialog.service.ts | 28 +- .../motion-main/motion-main.component.ts | 7 +- .../motion-multiselect-actions.component.ts | 19 +- .../motion-multiselect.module.ts | 6 +- .../motion-multiselect-service.module.ts | 2 +- .../services/motion-multiselect.service.ts | 24 +- .../pages/motions/definitions/follows.ts | 4 +- .../definitions/recommendation-type-names.ts | 2 +- .../motion-category-controller.service.ts | 18 +- .../view-models/view-motion-category.ts | 6 +- .../line-numbering.service.ts | 2 +- ...hange-recommendation-controller.service.ts | 16 +- .../motion-diff.service.spec.ts | 2 +- .../motion-diff.service.ts | 4 +- .../view-models/view-unified-change.ts | 2 +- .../motion-comment-controller.service.ts | 10 +- ...tion-comment-section-controller.service.ts | 10 +- .../motion-editor-controller.service.ts | 8 +- .../editors/view-models/view-motion-editor.ts | 6 +- .../motion-block-controller.service.ts | 10 +- .../view-models/view-motion-block.ts | 4 +- .../motion-poll-detail-content.component.ts | 18 +- .../motion-poll-dialog.component.ts | 13 +- .../motion-poll-form.component.ts | 9 +- .../motion-poll-meta-information.component.ts | 5 +- .../motion-poll-vote.component.ts | 12 +- .../motion-poll/motion-poll.component.ts | 13 +- .../modules/motion-poll/motion-poll.module.ts | 20 +- .../motion-poll-controller.service.ts | 8 +- .../motion-poll-dialog.service.ts | 4 +- .../motion-poll-pdf.service.ts | 7 +- .../services/motion-poll-service.module.ts | 4 +- .../motion-poll.service.ts | 16 +- .../personal-note-controller.service.ts | 16 +- .../view-models/has-personal-note.ts | 4 +- .../view-models/view-personal-note.ts | 2 +- .../motion-state-controller.service.ts | 14 +- .../motion-submitter-controller.service.ts | 8 +- .../view-models/view-motion-submitter.ts | 4 +- .../motion-supporter-controller.service.ts | 14 +- .../view-models/view-motion-supporter.ts | 6 +- .../tag-controller.service.ts | 10 +- .../modules/tags/view-models/has-tags.ts | 2 +- .../modules/tags/view-models/view-tag.ts | 6 +- .../meetings/pages/motions/modules/util.ts | 14 +- .../motion-workflow-controller.service.ts | 14 +- .../view-models/view-motion-workflow.ts | 10 +- ...orking-group-speaker-controller.service.ts | 8 +- .../view-motion-working-group-speaker.ts | 6 +- .../pages/motions/motions-routing.module.ts | 2 +- .../meetings/pages/motions/motions.config.ts | 40 +- .../pages/motions/motions.subscription.ts | 10 +- .../amendments/amendments-routing.module.ts | 2 +- .../pages/amendments/amendments.module.ts | 10 +- .../amendment-list-main.component.ts | 9 +- .../amendment-list.component.ts | 11 +- .../categories/categories-routing.module.ts | 2 +- .../pages/categories/categories.module.ts | 12 +- .../category-detail-sort.component.ts | 17 +- .../category-detail.component.ts | 17 +- .../category-list-sort.component.ts | 13 +- .../category-list/category-list.component.ts | 11 +- .../motions/pages/comments/comments.module.ts | 14 +- .../comment-section-list.component.ts | 19 +- .../comment-section-sort.component.ts | 7 +- .../motion-block-create-dialog.component.ts | 5 +- .../motion-block-create-dialog.module.ts | 4 +- .../motion-block-create-dialog.service.ts | 6 +- .../motion-block-detail.component.ts | 19 +- .../motion-block-edit-dialog.component.ts | 5 +- .../motion-block-edit-dialog.module.ts | 2 +- .../motion-block-edit-dialog.service.ts | 6 +- .../motion-block-list.component.ts | 13 +- .../motion-blocks/motion-blocks.module.ts | 10 +- ...motion-block-detail-filter-list.service.ts | 4 +- .../motion-block-sort.service.ts | 8 +- .../motion-call-list.component.ts | 13 +- .../motion-call-list-routing.module.ts | 2 +- .../motion-call-list.module.ts | 6 +- .../base-motion-detail-child.component.ts | 4 +- .../motion-detail/motion-detail.component.ts | 13 +- .../listen-editing.directive.ts | 10 +- ...-change-recommendation-dialog.component.ts | 2 +- ...-change-recommendation-dialog.component.ts | 9 +- ...-change-recommendation-dialog.component.ts | 3 +- ...ion-change-recommendation-dialog.module.ts | 4 +- ...on-change-recommendation-dialog.service.ts | 2 +- .../motion-detail/motion-detail.module.ts | 30 +- .../amendment-create-wizard.component.ts | 15 +- .../motion-form/motion-form.component.ts | 30 +- .../motion-form/motion-form-routing.module.ts | 2 +- .../pages/motion-form/motion-form.module.ts | 18 +- ...ase-motion-detail-action-card.component.ts | 4 +- .../motion-add-poll-button.component.ts | 6 +- .../motion-comment.component.ts | 8 +- .../motion-comments.component.ts | 6 +- .../motion-content.component.ts | 8 +- .../motion-delete-dialog.component.ts | 3 +- .../motion-detail-diff-summary.component.ts | 4 +- .../motion-detail-diff.component.ts | 16 +- ...iginal-change-recommendations.component.ts | 16 +- .../motion-extension-field.component.ts | 2 +- .../motion-final-version.component.ts | 4 +- .../motion-highlight-form.component.ts | 8 +- ...age-motion-meeting-users.component.spec.ts | 4 +- ...n-manage-motion-meeting-users.component.ts | 24 +- .../motion-manage-polls.component.ts | 2 +- .../motion-manage-supporters.component.ts | 34 +- .../motion-manage-timestamp.component.ts | 8 +- .../motion-manage-title.component.html | 5 +- .../motion-manage-title.component.ts | 6 +- .../motion-meta-data.component.html | 10 +- .../motion-meta-data.component.ts | 24 +- .../motion-personal-note.component.ts | 4 +- .../motion-view/motion-view.component.html | 6 +- .../motion-view/motion-view.component.ts | 26 +- .../origin-motion-meta-data.component.html | 6 +- .../origin-motion-meta-data.component.ts | 16 +- .../paragraph-based-amendment.component.ts | 8 +- .../pages/motion-view/motion-view.module.ts | 2 +- .../motion-export/motion-export.component.ts | 33 +- .../motion-list/motion-list.component.ts | 13 +- .../motion-list-info-dialog.component.ts | 14 +- .../motion-list-info-dialog/definitions.ts | 2 +- .../motion-list-info-dialog.module.ts | 4 +- .../motion-list-info-dialog.service.ts | 6 +- .../pages/motion-list/motion-list.module.ts | 16 +- .../motion-poll-detail.component.ts | 8 +- .../motion-poll-main.component.ts | 7 +- .../pages/motion-polls/motion-polls.module.ts | 10 +- .../components/tag-list/tag-list.component.ts | 9 +- .../pages/motions/pages/tags/tags.module.ts | 6 +- .../workflow-detail-sort.component.ts | 15 +- .../workflow-detail.component.ts | 15 +- .../workflow-import.component.html | 2 +- .../workflow-import.component.ts | 7 +- .../workflow-list/workflow-list.component.ts | 9 +- .../workflow-export.service.ts | 6 +- .../pages/workflows/workflows.module.ts | 12 +- .../amendment-controller.service.ts | 12 +- .../motion-controller.service.ts | 26 +- .../motion-format.service.ts | 8 +- .../motion-line-numbering.service.ts | 2 +- .../motion-permission.service.ts | 6 +- .../amendment-list-pdf.service.ts | 2 +- .../motions/services/export/definitions.ts | 2 +- .../motion-csv-export.service.ts | 10 +- .../motion-export.service.ts | 4 +- .../motion-html-to-pdf.service.ts | 6 +- .../motion-pdf-catalog.service.ts | 10 +- .../motion-pdf-export.service.ts | 8 +- .../motion-pdf.service/motion-pdf.service.ts | 18 +- .../motion-xlsx-export.service.ts | 8 +- .../services/export/motions-export.module.ts | 4 +- .../amendment-list-filter.service.ts | 6 +- .../amendment-list-sort.service.ts | 4 +- .../motion-list-base-sort.service.ts | 12 +- .../motion-list-filter.service.ts | 21 +- .../view-motion-amended-paragraph.ts | 4 +- .../pages/motions/view-models/view-motion.ts | 6 +- .../participant-main.component.ts | 9 +- .../participant-csv-export.service.ts | 8 +- .../export/participant-export.module.ts | 2 +- .../participant-pdf-export.service.ts | 4 +- .../participant-pdf.service.ts | 6 +- .../speaker-csv-export.service.ts | 12 +- .../group-list/group-list.component.html | 2 +- .../group-list/group-list.component.ts | 23 +- .../modules/groups/groups-routing.module.ts | 2 +- .../modules/groups/groups.module.ts | 4 +- .../services/group-controller.service.ts | 12 +- .../modules/groups/view-models/view-group.ts | 4 +- .../mandate-check-list.component.html | 12 +- .../mandate-check-list.component.ts | 16 +- .../mandate-check-main.component.ts | 9 +- .../mandate-check.routing.module.ts | 2 +- .../mandate-check.subscription.ts | 8 +- .../participant-detail-edit.component.ts | 36 +- .../participant-detail-view.component.ts | 24 +- .../participant-detail.component.ts | 5 +- .../participant-create-wizard.component.ts | 27 +- .../participant-detail-manage.module.ts | 10 +- .../participant-detail-routing.module.ts | 4 +- .../participant-detail.module.ts | 20 +- .../participant-import-list.component.ts | 7 +- .../participant-import/definitions/index.ts | 4 +- .../participant-import.module.ts | 8 +- .../participant-import.service.ts | 10 +- .../participant-list.component.ts | 36 +- .../participant-switch-dialog.component.ts | 9 +- .../participant-list-info-dialog.component.ts | 25 +- .../participant-list-info-dialog.module.ts | 4 +- .../participant-list-info-dialog.service.ts | 8 +- .../participant-list.module.ts | 18 +- .../participant-list-filter.service.ts | 16 +- .../participant-list-sort.service.ts | 14 +- .../participant-password.component.ts | 17 +- .../participant-password-routing.module.ts | 4 +- .../participant-password.module.ts | 6 +- .../participant-presence.component.ts | 7 +- .../participant-presence.module.ts | 4 +- .../participant-speaker-list.component.ts | 10 +- .../participant-speaker-list.module.ts | 18 +- ...participant-speaker-list-filter.service.ts | 8 +- .../participant-speaker-list-sort.service.ts | 6 +- .../structure-level-list.component.ts | 15 +- .../structure-level-controller.service.ts | 12 +- .../services/structure-level-sort.service.ts | 8 +- .../structure-level.module.ts | 14 +- .../view-structure-level-list-of-speakers.ts | 14 +- .../view-models/view-structure-level.ts | 8 +- .../participants-routing.module.ts | 2 +- .../pages/participants/participants.config.ts | 16 +- .../participants/participants.subscription.ts | 12 +- .../participant-common-service.module.ts | 2 +- .../participant-controller.service.ts | 52 +- .../poll-main/poll-main.component.ts | 7 +- .../poll-list/poll-list.component.ts | 11 +- .../modules/poll-list/poll-list.module.ts | 6 +- .../poll-list-filter.service.ts | 6 +- .../meetings/pages/polls/polls.config.ts | 20 +- .../pages/polls/polls.subscription.ts | 10 +- .../pages/polls/view-models/has-polls.ts | 4 +- .../view-models/view-poll-candidate-list.ts | 4 +- .../polls/view-models/view-poll-candidate.ts | 4 +- .../pages/polls/view-models/view-poll.ts | 22 +- .../pages/polls/view-models/view-vote.ts | 2 +- .../projector-countdown-dialog.component.ts | 7 +- .../projector-countdown-dialog.module.ts | 2 +- .../projector-countdown-dialog.service.ts | 4 +- .../projector-edit-dialog.component.ts | 18 +- .../projector-edit-dialog.module.ts | 2 +- .../services/projector-edit-dialog.service.ts | 10 +- .../projector-main.component.ts | 7 +- .../projector-message-dialog.component.ts | 5 +- .../projector-message-dialog.module.ts | 4 +- .../projector-message-dialog.service.ts | 4 +- .../projectors/definitions/slide-data.ts | 2 +- .../fullscreen-projector-detail.component.ts | 13 +- .../fullscreen-projector-main.component.ts | 9 +- .../fullscreen-projector.component.ts | 11 +- .../fullscreen-projector.module.ts | 4 +- .../countdown-controls.component.ts | 15 +- .../message-controls.component.ts | 9 +- .../presentation-controls.component.ts | 7 +- .../projector-detail.component.ts | 31 +- .../projector-detail.module.ts | 12 +- .../current-speaker-chyron-slide.service.ts | 12 +- .../projection-controller.service.ts | 12 +- .../projector-countdown-controller.service.ts | 12 +- .../projector-message-controller.service.ts | 12 +- .../projector-list-entry.component.ts | 17 +- .../projector-list.component.ts | 16 +- .../projector-list/projector-list.module.ts | 10 +- .../pages/projectors/projector.config.ts | 20 +- .../projectors/projectors.subscription.ts | 12 +- .../services/projector-controller.service.ts | 16 +- .../projectors/view-models/view-projection.ts | 2 +- .../view-models/view-projector-countdown.ts | 2 +- .../projectors/view-models/view-projector.ts | 16 +- .../pages/settings/settings.config.ts | 4 +- .../services/active-meeting-id.service.ts | 2 +- .../services/active-meeting.service.ts | 8 +- .../services/active-meeting.subscription.ts | 10 +- .../meetings/services/active-polls.service.ts | 6 +- .../services/active-polls.subscription.ts | 6 +- .../meeting-csv-export-for-backend.service.ts | 6 +- .../export/meeting-csv-export.service.ts | 4 +- .../services/export/meeting-export.module.ts | 2 +- .../export/meeting-pdf-export.service.ts | 14 +- .../meetings/services/media-manage.service.ts | 12 +- .../meeting-collection-mapper.service.ts | 12 +- ...ng-controller-service-collector.service.ts | 8 +- .../services/meeting-controller.service.ts | 10 +- .../services/meeting-data-store.service.ts | 2 +- ...eeting-settings-definition.service.spec.ts | 6 +- .../meeting-settings-definition.service.ts | 2 +- .../meeting-settings-definitions.ts | 14 +- .../sequential-number-mapping.service.ts | 20 +- .../pages/meetings/view-models/has-meeting.ts | 2 +- .../meetings/view-models/view-meeting-user.ts | 6 +- .../meetings/view-models/view-meeting.ts | 18 +- .../pages/meetings/view-models/view-user.ts | 8 +- .../account-search-selector.module.ts | 4 +- .../account-search-selector.component.ts | 23 +- .../modules/navigation/navigation.module.ts | 8 +- ...ganization-navigation-wrapper.component.ts | 11 +- .../organization-navigation.component.ts | 15 +- .../pages/organization/organization.config.ts | 2 +- .../organization/organization.subscription.ts | 10 +- .../pages/accounts/accounts.subscription.ts | 4 +- .../account-main/account-main.component.ts | 13 +- .../account-detail/account-detail.module.ts | 12 +- .../account-add-to-meetings.component.ts | 20 +- .../account-detail-main.component.ts | 5 +- .../account-detail.component.html | 2 +- .../account-detail.component.ts | 23 +- .../account-password.component.ts | 21 +- .../account-import/account-import.module.ts | 6 +- .../account-import-list.component.ts | 9 +- .../pages/account-import/definitions/index.ts | 2 +- .../account-import.service.ts | 6 +- .../pages/account-list/account-list.module.ts | 16 +- .../account-list-main.component.ts | 5 +- .../account-list/account-list.component.ts | 24 +- .../account-merge-dialog.component.ts | 2 +- .../account-list-search.service.ts | 4 +- .../account-sort.service.ts | 8 +- .../pages/gender/gender.subscription.ts | 2 +- .../accounts/pages/gender/genders.config.ts | 6 +- .../gender-list/gender-list.component.ts | 6 +- .../pages/gender-list/gender-list.module.ts | 8 +- .../services/gender-controller.service.ts | 10 +- .../pages/gender/view-models/view-gender.ts | 8 +- .../services/account-export-service.module.ts | 2 +- .../account-export.service.ts | 6 +- .../common/account-common-service.module.ts | 2 +- .../common/account-controller.service.ts | 28 +- .../services/common/account-filter.service.ts | 16 +- .../committees/committees.subscription.ts | 8 +- .../export/committee-csv-export-example.ts | 2 +- .../modules/committee-components.module.ts | 6 +- .../committee-meeting-preview.component.ts | 15 +- .../committee-meta-info.component.ts | 3 +- .../committee-components-service.module.ts | 2 +- .../modules/services/meeting.service.ts | 6 +- .../committee-detail.component.ts | 5 +- .../committee-detail-edit.module.ts | 10 +- .../committee-detail-edit.component.ts | 23 +- .../committee-detail-meeting.module.ts | 16 +- ...committee-detail-meeting-main.component.ts | 9 +- .../meeting-edit/meeting-edit.component.html | 2 +- .../meeting-edit/meeting-edit.component.ts | 38 +- .../meeting-import.component.ts | 19 +- .../committee-detail-view.module.ts | 12 +- .../committee-detail-view.component.html | 4 +- .../committee-detail-view.component.ts | 21 +- .../committee-import.module.ts | 6 +- .../committee-import-list.component.ts | 9 +- .../committee-import-service.module.ts | 2 +- .../committee-import.service.ts | 8 +- .../committee-list/committee-list.module.ts | 16 +- .../committee-list.component.ts | 17 +- .../committee-export.service.ts | 4 +- .../committee-filter.service.ts | 6 +- .../services/committee-list-service.module.ts | 2 +- .../committee-sort.service.ts | 6 +- .../committee-main.component.ts | 5 +- .../services/committee-controller.service.ts | 4 +- .../committees/view-models/view-committee.ts | 12 +- .../pages/dashboard/dashboard.subscription.ts | 8 +- .../dashboard/dashboard.component.html | 18 +- .../dashboard/dashboard.component.ts | 15 +- .../dashboard-detail.module.ts | 6 +- .../dashboard-main.component.ts | 5 +- .../pages/designs/designs.config.ts | 6 +- .../pages/designs/designs.module.ts | 8 +- .../pages/designs/designs.subscription.ts | 6 +- .../theme-builder-dialog.component.ts | 13 +- .../services/theme-builder-dialog.service.ts | 4 +- .../theme-builder-dialog.module.ts | 4 +- .../design-main/design-main.component.ts | 5 +- .../theme-list/theme-list.component.ts | 11 +- .../pages/theme-list/theme-list.module.ts | 8 +- .../services/theme-controller.service.ts | 14 +- .../pages/designs/view-models/view-theme.ts | 6 +- .../organization-mediafile-main.component.ts | 2 +- .../mediafiles/mediafiles-routing.module.ts | 4 +- .../mediafiles/mediafiles.subscription.ts | 2 +- ...organization-mediafile-list.component.html | 2 +- .../organization-mediafile-list.component.ts | 24 +- .../organization-mediafile-list.module.ts | 12 +- ...organization-mediafile-upload.component.ts | 10 +- .../organization-mediafile-upload.module.ts | 8 +- .../meeting-list/meeting-list.component.html | 4 +- .../meeting-list/meeting-list.component.ts | 14 +- .../pages/meeting-list/meeting-list.module.ts | 18 +- .../services/meeting-export.service.ts | 8 +- .../meeting-list-filter.service.ts | 10 +- .../services/meeting-list-service.module.ts | 2 +- .../meeting-list-sort.service.ts | 8 +- .../orga-meetings-main.component.ts | 7 +- .../organization-info.component.ts | 9 +- .../organization-statistics.component.ts | 11 +- .../organization-info.module.ts | 8 +- .../organization-tag-dialog.component.html | 7 +- .../organization-tag-dialog.component.ts | 5 +- .../organization-tag-dialog.module.ts | 6 +- .../organization-tag-dialog.service.ts | 6 +- .../organization-tags.config.ts | 6 +- .../organization-tags.module.ts | 10 +- .../organization-tags.subscription.ts | 6 +- .../organization-tag-list.component.ts | 13 +- .../organization-tag-list.module.ts | 8 +- .../organization-tag-main.component.ts | 5 +- .../organization-tag-controller.service.ts | 10 +- .../view-models/has-organization-tags.ts | 2 +- .../view-models/view-organization-tag.ts | 6 +- .../resources/view-models/view-resource.ts | 4 +- .../organization-settings.component.html | 4 +- .../organization-settings.component.ts | 24 +- .../settings-detail/settings-detail.module.ts | 8 +- .../services/organization-settings.service.ts | 2 +- .../services/organization.service.ts | 2 +- .../view-models/view-organization.ts | 2 +- .../services/active-filters.service.spec.ts | 2 +- .../site/services/active-filters.service.ts | 6 +- .../app/site/services/auth-check.service.ts | 10 +- client/src/app/site/services/auth.service.ts | 2 +- .../autoupdate-communication.service.ts | 20 +- .../services/autoupdate/autoupdate.service.ts | 2 +- .../collection-mapper.service.ts | 6 +- .../collection-mapper.ts | 8 +- .../collection-mapper.service/definitions.ts | 6 +- .../app/site/services/data-store.service.ts | 2 +- .../site/services/fallback-routes.service.ts | 2 +- .../services/global-search/definitions.ts | 2 +- .../global-search/global-search.service.ts | 14 +- .../site/services/lifecycle.service.spec.ts | 2 +- .../app/site/services/lifecycle.service.ts | 4 +- .../model-request-builder.service.ts | 2 +- .../model-request-object.ts | 2 +- .../site/services/model-request.service.ts | 4 +- .../services/openslides-router.service.ts | 12 +- .../openslides-status.service.spec.ts | 2 +- .../services/openslides-status.service.ts | 2 +- .../src/app/site/services/operator.service.ts | 16 +- .../src/app/site/services/reroute.service.ts | 2 +- .../app/site/services/theme.service.spec.ts | 4 +- client/src/app/site/services/theme.service.ts | 2 +- .../app/site/services/time-zone.service.ts | 6 +- .../site/services/user-controller.service.ts | 12 +- client/src/app/site/services/user.service.ts | 12 +- .../view-model-store-update.service.ts | 10 +- .../ui/base/base-sort-tree-view-component.ts | 10 +- client/src/app/ui/base/base-ui-component.ts | 6 +- client/src/app/ui/base/import-service.ts | 8 +- .../app/ui/base/view-model-list-provider.ts | 2 +- .../autofocus/autofocus.directive.spec.ts | 3 +- .../meeting-setting.directive.spec.ts | 7 +- .../meeting-setting.directive.ts | 6 +- .../directives/perms/base-perms.directive.ts | 2 +- .../perms/cml-perms.directive.spec.ts | 9 +- .../directives/perms/cml-perms.directive.ts | 4 +- .../perms/oml-perms.directive.spec.ts | 7 +- .../directives/perms/oml-perms.directive.ts | 2 +- .../directives/perms/perms.directive.spec.ts | 9 +- .../ui/directives/perms/perms.directive.ts | 4 +- .../ui/modules/chip/chip.component.spec.ts | 3 +- .../src/app/ui/modules/chip/chip.component.ts | 7 +- .../choice-dialog/choice-dialog.component.ts | 9 +- .../choice-dialog/definitions/index.ts | 4 +- .../choice-dialog/services/choice.service.ts | 2 +- .../color-form-field.component.ts | 5 +- .../base-datepicker.component.ts | 4 +- .../modules/datepicker/datepicker.module.ts | 2 +- .../editor-embed-dialog.component.ts | 3 +- .../editor-html-dialog.component.ts | 3 +- .../editor-image-dialog.component.ts | 3 +- .../editor-link-dialog.component.ts | 3 +- .../components/editor/editor.component.ts | 6 +- .../app/ui/modules/editor/editor.module.ts | 4 +- .../expandable-content-wrapper.component.ts | 2 +- .../modules/file-list/file-list.component.ts | 22 +- .../file-upload/file-upload.component.ts | 6 +- .../modules/file-upload/file-upload.module.ts | 4 +- .../ui/modules/grid/grid/grid.component.ts | 3 +- .../ui/modules/grid/tile/tile.component.ts | 12 +- .../components/head-bar/head-bar.component.ts | 4 +- .../ui/modules/head-bar/head-bar.module.ts | 2 +- .../head-toolbar/head-toolbar.component.ts | 4 +- .../icon-container.component.ts | 3 +- .../backend-import-list.component.ts | 8 +- .../definitions/backend-import-preview.ts | 2 +- .../modules/import-list/import-list.module.ts | 6 +- .../rounded-input/rounded-input.component.ts | 15 +- .../modules/list/base/base-list.component.ts | 6 +- .../filter-menu/filter-menu.component.spec.ts | 2 +- .../filter-menu/filter-menu.component.ts | 4 +- .../components/list/list.component.spec.ts | 2 +- .../list/components/list/list.component.ts | 2 +- .../sort-bottom-sheet.component.ts | 7 +- .../sort-filter-bar.component.spec.ts | 4 +- .../sort-filter-bar.component.ts | 12 +- .../view-list/view-list.component.spec.ts | 4 +- .../view-list/view-list.component.ts | 4 +- .../list/definitions/filter-service.ts | 6 +- .../modules/list/definitions/sort-service.ts | 4 +- client/src/app/ui/modules/list/list.module.ts | 8 +- .../list/services/list-search.service.ts | 2 +- .../media-upload-content.component.ts | 13 +- .../meeting-time/meeting-time.component.ts | 7 +- .../openslides-date-adapter.ts | 9 +- .../openslides-overlay/overlay.component.ts | 2 + .../services/overlay.service.ts | 2 +- .../prompt-checkbox.component.ts | 3 +- .../prompt-dialog/prompt-dialog.component.ts | 3 +- .../ui/modules/qr-code/qr-code.component.ts | 3 +- .../scrolling-table.component.ts | 21 +- .../scrolling-table-cell-label.directive.ts | 10 +- .../scrolling-table-no-data.directive.ts | 6 +- .../base-search-selector.component.ts | 4 +- .../list-search-selector.component.ts | 1 + .../repo-search-selector.component.ts | 15 +- .../ui/modules/search-selector/definitions.ts | 2 +- .../search-selector/search-selector.module.ts | 2 +- .../copyright-sign.component.ts | 3 +- .../components/image/image.component.ts | 5 +- .../sidenav/components/logo/logo.component.ts | 9 +- .../components/sidenav/sidenav.component.ts | 5 +- .../base-game-dialog/base-game-dialog.ts | 6 +- ...r-egg-content-platform-dialog.component.ts | 3 +- .../modules/easter-egg/easter-egg.module.ts | 6 +- .../modules/c4-dialog/c4-dialog.module.ts | 2 +- .../c4-dialog/c4-dialog.component.ts | 3 +- .../chess-dialog/chess-dialog.module.ts | 4 +- .../chess-dialog/chess-dialog.component.ts | 15 +- .../services/chess-challenge.service.ts | 6 +- .../easter-egg-content-platform.service.ts | 4 +- .../app/ui/modules/sidenav/sidenav.module.ts | 2 +- .../sorting-list/sorting-list.component.ts | 16 +- .../sorting-list/sorting-list.module.ts | 2 +- .../sorting-tree/sorting-tree.component.ts | 21 +- .../services/tree-sort.service.spec.ts | 8 +- .../services/tree-sort.service.ts | 6 +- .../sorting-tree/services/tree.service.ts | 6 +- .../components/spinner/spinner.component.ts | 3 +- .../app/ui/modules/spinner/spinner.module.ts | 2 +- .../vertical-tab-group.component.ts | 4 +- .../localized-date-range.pipe.spec.ts | 4 +- .../localized-date-range.pipe.ts | 2 +- .../localized-date.pipe.spec.ts | 2 +- .../localized-date/localized-date.pipe.ts | 2 +- .../src/app/ui/pipes/time/time.pipe.spec.ts | 2 +- .../autoupdate/autoupdate-stream-pool.ts | 2 +- .../autoupdate/autoupdate-subscription.ts | 2 +- .../autoupdate/interfaces-autoupdate.ts | 2 +- client/src/app/worker/http/auth.spec.ts | 2 +- client/src/app/worker/http/auth.ts | 5 +- .../app/worker/http/http-stream-pool.spec.ts | 2 +- .../src/app/worker/http/http-stream.spec.ts | 2 +- .../http/http-subscription-polling.spec.ts | 2 +- .../worker/http/http-subscription-sse.spec.ts | 5 +- .../app/worker/http/http-subscription-sse.ts | 2 +- .../src/app/worker/http/http-subscription.ts | 2 +- client/src/app/worker/icc/icc-stream-pool.ts | 2 +- client/src/app/worker/icc/icc-stream.ts | 2 +- client/src/app/worker/sw-autoupdate.ts | 3 +- client/src/e2e-imports.module.ts | 4 +- .../models/test-change-recommendation.ts | 4 +- client/tsconfig.app.json | 14 +- client/tsconfig.json | 7 +- client/tsconfig.spec.json | 31 +- client/tsconfig.worker.json | 3 +- 994 files changed, 5701 insertions(+), 6048 deletions(-) diff --git a/client/angular.json b/client/angular.json index 0939b3a971..de2484b459 100644 --- a/client/angular.json +++ b/client/angular.json @@ -134,7 +134,12 @@ ], "scripts": [], "webWorkerTsConfig": "tsconfig.worker.json", - "sourceMap": false + "sourceMap": false, + "stylePreprocessorOptions": { + "includePaths": [ + "." + ] + } } }, "lint": { diff --git a/client/cli/generate-permissions.ts b/client/cli/generate-permissions.ts index 8e3c84f899..739e5f6820 100644 --- a/client/cli/generate-permissions.ts +++ b/client/cli/generate-permissions.ts @@ -3,7 +3,7 @@ import * as yaml from 'js-yaml'; import * as path from 'path'; import dedent from 'ts-dedent'; -import { overloadJsFunctions } from 'src/app/infrastructure/utils/overload-js-functions'; +import { overloadJsFunctions } from '@app/infrastructure/utils/overload-js-functions'; overloadJsFunctions(); diff --git a/client/cli/generate-settings-defaults.ts b/client/cli/generate-settings-defaults.ts index bd79e97f1d..a409c1cacc 100644 --- a/client/cli/generate-settings-defaults.ts +++ b/client/cli/generate-settings-defaults.ts @@ -12,7 +12,7 @@ const FILE_TEMPLATE = dedent` // THIS FILE IS GENERATED AUTOMATICALLY. DO NOT CHANGE IT MANUALLY. import { _ } from "@ngx-translate/core"; - import { Settings } from 'src/app/domain/models/meetings/meeting'; + import { Settings } from '@app/domain/models/meetings/meeting'; export const meetingSettingsDefaults: { [key in keyof Settings]: any } = { `; diff --git a/client/cli/get-available-languages.ts b/client/cli/get-available-languages.ts index 419ec1e276..a545b05087 100644 --- a/client/cli/get-available-languages.ts +++ b/client/cli/get-available-languages.ts @@ -1,6 +1,6 @@ /** * Helper script to print a comma-separated list of all available translations. */ -import { availableTranslations } from 'src/app/domain/definitions/languages'; +import { availableTranslations } from '@app/domain/definitions/languages'; console.log(Object.keys(availableTranslations).join(`,`)); diff --git a/client/cli/tsconfig.json b/client/cli/tsconfig.json index bad0fd49b5..c6dc08a335 100644 --- a/client/cli/tsconfig.json +++ b/client/cli/tsconfig.json @@ -3,8 +3,10 @@ "compilerOptions": { "baseUrl": "../", "module": "commonjs", + "types": ["node"], "paths": { "*": ["*"] - } + }, + "rootDir": ".." } } diff --git a/client/eslint.config.mjs b/client/eslint.config.mjs index 0565bc90a9..2bb196a087 100644 --- a/client/eslint.config.mjs +++ b/client/eslint.config.mjs @@ -32,6 +32,7 @@ export default tseslint.config({ }, processor: angular.processInlineTemplates, rules: { + "@angular-eslint/prefer-on-push-component-change-detection": ["off"], "@angular-eslint/prefer-standalone": ["off"], "@angular-eslint/prefer-inject": ["off"], "@angular-eslint/component-selector": ["error", { diff --git a/client/package-lock.json b/client/package-lock.json index 586a2aac45..b9b7a679ea 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -9,25 +9,25 @@ "version": "4.2.x-dev", "license": "MIT", "dependencies": { - "@angular/animations": "^21.2.16", - "@angular/cdk": "^21.2.14", - "@angular/common": "^21.2.17", - "@angular/compiler": "^21.2.17", - "@angular/core": "^21.2.17", - "@angular/forms": "^21.2.17", - "@angular/material": "^21.2.14", - "@angular/material-date-fns-adapter": "^21.2.14", - "@angular/platform-browser": "^21.2.17", - "@angular/platform-browser-dynamic": "^21.2.17", - "@angular/router": "^21.2.17", - "@angular/service-worker": "^21.2.17", + "@angular/animations": "^22.0.6", + "@angular/cdk": "^22.0.4", + "@angular/common": "^22.0.6", + "@angular/compiler": "^22.0.6", + "@angular/core": "^22.0.6", + "@angular/forms": "^22.0.6", + "@angular/material": "^22.0.4", + "@angular/material-date-fns-adapter": "^22.0.4", + "@angular/platform-browser": "^22.0.6", + "@angular/platform-browser-dynamic": "^22.0.6", + "@angular/router": "^22.0.6", + "@angular/service-worker": "^22.0.6", "@cantoo/pdf-lib": "^2.7.1", - "@coreui/angular-chartjs": "~5.6.25", + "@coreui/angular-chartjs": "~5.7.3", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", "@intevation/tiptap-extension-office-paste": "^0.1.2", "@material/typography": "^14.0.0", - "@ngx-pwa/local-storage": "^21.0.0", + "@ngx-pwa/local-storage": "^22.0.0", "@ngx-translate/core": "^17.0.0", "@ngx-translate/http-loader": "^17.0.0", "@openslides/motion-diff": "file:../packages/openslides-motion-diff", @@ -60,9 +60,9 @@ "jszip": "^3.10.1", "lodash-es": "^4.18.1", "material-design-icons-iconfont": "^6.7.0", - "ngx-cookie-service": "^21.3.1", + "ngx-cookie-service": "^22.0.0", "ngx-date-fns": "^12.0.1", - "ngx-device-detector": "^11.0.0", + "ngx-device-detector": "^12.0.0", "ngx-file-drop": "^16.0.0", "ngx-papaparse": "^8.0.0", "pdfmake": "^0.3.11", @@ -71,19 +71,18 @@ "rxjs": "^7.8.2", "tinycolor2": "1.6.0", "video.js": "^8.23.9", - "zone.js": "^0.16.1" + "zone.js": "^0.16.2" }, "devDependencies": { - "@angular-eslint/builder": "^21.4.0", - "@angular-eslint/eslint-plugin": "^21.4.0", - "@angular-eslint/eslint-plugin-template": "^21.4.0", - "@angular-eslint/schematics": "^21.4.0", - "@angular-eslint/template-parser": "^21.3.0", - "@angular/build": "^21.2.18", - "@angular/cli": "^21.2.18", - "@angular/compiler-cli": "^21.2.17", - "@angular/language-server": "^21.2.17", - "@coreui/angular-chartjs": "^5.6.25", + "@angular-eslint/builder": "^22.1.0", + "@angular-eslint/eslint-plugin": "^22.1.0", + "@angular-eslint/eslint-plugin-template": "^22.1.0", + "@angular-eslint/schematics": "^22.1.0", + "@angular-eslint/template-parser": "^22.1.0", + "@angular/build": "^22.0.6", + "@angular/cli": "^22.0.6", + "@angular/compiler-cli": "^22.0.6", + "@angular/language-server": "^22.0.6", "@stylistic/eslint-plugin": "^5.10.0", "@types/file-saver": "^2.0.7", "@types/jasmine": "~5.1.15", @@ -95,14 +94,15 @@ "@types/video.js": "^7.3.58", "@typescript-eslint/eslint-plugin": "^8.63.0", "@typescript-eslint/parser": "^8.63.0", - "@vendure/ngx-translate-extract": "^10.1.3", - "angular-eslint": "^21.4.0", + "@vendure/ngx-translate-extract": "^10.2.0", + "angular-eslint": "^22.1.0", "eslint": "^9.39.4", "eslint-config-prettier": "^10.1.8", "eslint-plugin-prettier": "^5.5.6", "eslint-plugin-simple-import-sort": "^13.0.0", "eslint-plugin-unused-imports": "^4.4.1", "fetch-mock": "^12.6.0", + "istanbul-lib-instrument": "^6.0.3", "jasmine-core": "^5.13.0", "js-yaml": "^5.2.1", "karma": "~6.4.4", @@ -115,7 +115,7 @@ "ts-morph": "^28.0.0", "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", - "typescript": "^5.9.3", + "typescript": "^6.0.3", "typescript-eslint": "^8.63.0" } }, @@ -138,57 +138,57 @@ } }, "node_modules/@algolia/abtesting": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/@algolia/abtesting/-/abtesting-1.14.1.tgz", - "integrity": "sha512-Dkj0BgPiLAaim9sbQ97UKDFHJE/880wgStAM18U++NaJ/2Cws34J5731ovJifr6E3Pv4T2CqvMXf8qLCC417Ew==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@algolia/abtesting/-/abtesting-1.18.0.tgz", + "integrity": "sha512-8siuLG+FIns1AjZ/g2SDVwHz9S+ObacDQISEJvS8XsNei1zl3FXqfqQrBpmrG7ACWCyesXHbicMJtvRbg00FEw==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1", - "@algolia/requester-browser-xhr": "5.48.1", - "@algolia/requester-fetch": "5.48.1", - "@algolia/requester-node-http": "5.48.1" + "@algolia/client-common": "5.52.0", + "@algolia/requester-browser-xhr": "5.52.0", + "@algolia/requester-fetch": "5.52.0", + "@algolia/requester-node-http": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/@algolia/client-abtesting": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.48.1.tgz", - "integrity": "sha512-LV5qCJdj+/m9I+Aj91o+glYszrzd7CX6NgKaYdTOj4+tUYfbS62pwYgUfZprYNayhkQpVFcrW8x8ZlIHpS23Vw==", + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.52.0.tgz", + "integrity": "sha512-wtwPgyPmO7b7sQPVgoK29c1VpfS08DnnJCmxX/oU1pV2DlMRJCzQcLN7JSloYpodyKHwM8+9wOzlAM0co3TDmA==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1", - "@algolia/requester-browser-xhr": "5.48.1", - "@algolia/requester-fetch": "5.48.1", - "@algolia/requester-node-http": "5.48.1" + "@algolia/client-common": "5.52.0", + "@algolia/requester-browser-xhr": "5.52.0", + "@algolia/requester-fetch": "5.52.0", + "@algolia/requester-node-http": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/@algolia/client-analytics": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.48.1.tgz", - "integrity": "sha512-/AVoMqHhPm14CcHq7mwB+bUJbfCv+jrxlNvRjXAuO+TQa+V37N8k1b0ijaRBPdmSjULMd8KtJbQyUyabXOu6Kg==", + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.52.0.tgz", + "integrity": "sha512-9KY36bRl4AH7RjqSeDDOKnjsz4IxQFBEOB8/fWmEbdQe+Isbs5jGzVJu9NEPQ1Tgwxlf8Uf07Swj3jZyMNUZ2g==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1", - "@algolia/requester-browser-xhr": "5.48.1", - "@algolia/requester-fetch": "5.48.1", - "@algolia/requester-node-http": "5.48.1" + "@algolia/client-common": "5.52.0", + "@algolia/requester-browser-xhr": "5.52.0", + "@algolia/requester-fetch": "5.52.0", + "@algolia/requester-node-http": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/@algolia/client-common": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.48.1.tgz", - "integrity": "sha512-VXO+qu2Ep6ota28ktvBm3sG53wUHS2n7bgLWmce5jTskdlCD0/JrV4tnBm1l7qpla1CeoQb8D7ShFhad+UoSOw==", + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.52.0.tgz", + "integrity": "sha512-3a/qM3dzJqqfTx7Yrw7uGQ98I3Q0rDfb4Vkv0wEzko96l7YQMxfBVz/VbLq2N+c59GweYv6Vhp8mPeqnWJSITw==", "dev": true, "license": "MIT", "engines": { @@ -196,151 +196,151 @@ } }, "node_modules/@algolia/client-insights": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@algolia/client-insights/-/client-insights-5.48.1.tgz", - "integrity": "sha512-zl+Qyb0nLg+Y5YvKp1Ij+u9OaPaKg2/EPzTwKNiVyOHnQJlFxmXyUZL1EInczAZsEY8hVpPCLtNfhMhfxluXKQ==", + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/@algolia/client-insights/-/client-insights-5.52.0.tgz", + "integrity": "sha512-Rki7ACbMcvbQW0BuM84x9dkGHY47ABmv4jU6tYssat2k02p3mIUms2YOLUAMeknhmnFsj6lb6ZzOXdMWMyc1sA==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1", - "@algolia/requester-browser-xhr": "5.48.1", - "@algolia/requester-fetch": "5.48.1", - "@algolia/requester-node-http": "5.48.1" + "@algolia/client-common": "5.52.0", + "@algolia/requester-browser-xhr": "5.52.0", + "@algolia/requester-fetch": "5.52.0", + "@algolia/requester-node-http": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/@algolia/client-personalization": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.48.1.tgz", - "integrity": "sha512-r89Qf9Oo9mKWQXumRu/1LtvVJAmEDpn8mHZMc485pRfQUMAwSSrsnaw1tQ3sszqzEgAr1c7rw6fjBI+zrAXTOw==", + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.52.0.tgz", + "integrity": "sha512-96s4Uzc3kk+/f4jJXIVVGWP5XlngOGNQ1x6hW9AT59pOixHlOs5tqJg+ZUS/GQ6h/iYP0ceQcmxDQeLyCLTaDQ==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1", - "@algolia/requester-browser-xhr": "5.48.1", - "@algolia/requester-fetch": "5.48.1", - "@algolia/requester-node-http": "5.48.1" + "@algolia/client-common": "5.52.0", + "@algolia/requester-browser-xhr": "5.52.0", + "@algolia/requester-fetch": "5.52.0", + "@algolia/requester-node-http": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/@algolia/client-query-suggestions": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@algolia/client-query-suggestions/-/client-query-suggestions-5.48.1.tgz", - "integrity": "sha512-TPKNPKfghKG/bMSc7mQYD9HxHRUkBZA4q1PEmHgICaSeHQscGqL4wBrKkhfPlDV1uYBKW02pbFMUhsOt7p4ZpA==", + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/@algolia/client-query-suggestions/-/client-query-suggestions-5.52.0.tgz", + "integrity": "sha512-lqeycNpSPe5Qa0OUWpejVvYQjQWV5nQuLT0a4aq7XzRAvCxprV/6Lf841EygdD2nrFnuS58ok7Au1uOtXzpnkg==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1", - "@algolia/requester-browser-xhr": "5.48.1", - "@algolia/requester-fetch": "5.48.1", - "@algolia/requester-node-http": "5.48.1" + "@algolia/client-common": "5.52.0", + "@algolia/requester-browser-xhr": "5.52.0", + "@algolia/requester-fetch": "5.52.0", + "@algolia/requester-node-http": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/@algolia/client-search": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.48.1.tgz", - "integrity": "sha512-4Fu7dnzQyQmMFknYwTiN/HxPbH4DyxvQ1m+IxpPp5oslOgz8m6PG5qhiGbqJzH4HiT1I58ecDiCAC716UyVA8Q==", + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.52.0.tgz", + "integrity": "sha512-ly1wETVGRo30cx61O7fetESN+ElL9c9K+bD/AVgnT1ar4c6v+/Yqjrhdtu6Fm4D0s4NZP081Isf6tunH1wUXHg==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1", - "@algolia/requester-browser-xhr": "5.48.1", - "@algolia/requester-fetch": "5.48.1", - "@algolia/requester-node-http": "5.48.1" + "@algolia/client-common": "5.52.0", + "@algolia/requester-browser-xhr": "5.52.0", + "@algolia/requester-fetch": "5.52.0", + "@algolia/requester-node-http": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/@algolia/ingestion": { - "version": "1.48.1", - "resolved": "https://registry.npmjs.org/@algolia/ingestion/-/ingestion-1.48.1.tgz", - "integrity": "sha512-/RFq3TqtXDUUawwic/A9xylA2P3LDMO8dNhphHAUOU51b1ZLHrmZ6YYJm3df1APz7xLY1aht6okCQf+/vmrV9w==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/@algolia/ingestion/-/ingestion-1.52.0.tgz", + "integrity": "sha512-U4EeTvgmluRjj39ykZSAd5X+a6LD5m7/mcOWDmB7hqm1R6QY0yT8jLxpNVEjYhzgEN5hcDGW6X67EWQY8KiYGQ==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1", - "@algolia/requester-browser-xhr": "5.48.1", - "@algolia/requester-fetch": "5.48.1", - "@algolia/requester-node-http": "5.48.1" + "@algolia/client-common": "5.52.0", + "@algolia/requester-browser-xhr": "5.52.0", + "@algolia/requester-fetch": "5.52.0", + "@algolia/requester-node-http": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/@algolia/monitoring": { - "version": "1.48.1", - "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.48.1.tgz", - "integrity": "sha512-Of0jTeAZRyRhC7XzDSjJef0aBkgRcvRAaw0ooYRlOw57APii7lZdq+layuNdeL72BRq1snaJhoMMwkmLIpJScw==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.52.0.tgz", + "integrity": "sha512-FCPnDcILfpTE94u7BVlV4DmnSV5wE3+j25EEF+3dYPrVzkVCSoAHs318oWDGxnxsAgiL4HpL12Jc4XHmw9shpA==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1", - "@algolia/requester-browser-xhr": "5.48.1", - "@algolia/requester-fetch": "5.48.1", - "@algolia/requester-node-http": "5.48.1" + "@algolia/client-common": "5.52.0", + "@algolia/requester-browser-xhr": "5.52.0", + "@algolia/requester-fetch": "5.52.0", + "@algolia/requester-node-http": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/@algolia/recommend": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.48.1.tgz", - "integrity": "sha512-bE7JcpFXzxF5zHwj/vkl2eiCBvyR1zQ7aoUdO+GDXxGp0DGw7nI0p8Xj6u8VmRQ+RDuPcICFQcCwRIJT5tDJFw==", + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.52.0.tgz", + "integrity": "sha512-br3DO7n4N8CXwTRbZS0MnB4WQ9YHfNjCwkCEzVR/wek/qNTDQKDb0nROmkFaNZ8ucUqUVKZi074dbwMwRDlK8Q==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1", - "@algolia/requester-browser-xhr": "5.48.1", - "@algolia/requester-fetch": "5.48.1", - "@algolia/requester-node-http": "5.48.1" + "@algolia/client-common": "5.52.0", + "@algolia/requester-browser-xhr": "5.52.0", + "@algolia/requester-fetch": "5.52.0", + "@algolia/requester-node-http": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/@algolia/requester-browser-xhr": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.48.1.tgz", - "integrity": "sha512-MK3wZ2koLDnvH/AmqIF1EKbJlhRS5j74OZGkLpxI4rYvNi9Jn/C7vb5DytBnQ4KUWts7QsmbdwHkxY5txQHXVw==", + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.52.0.tgz", + "integrity": "sha512-b0T/Ca2c9KyEslKsVrGZvbe1UrrKKSdfXhBZ2pbpKahFUzJfziRZ0urbOm7V65O0tO/jwU+Lo/+bIiiyhzGt8w==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1" + "@algolia/client-common": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/@algolia/requester-fetch": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.48.1.tgz", - "integrity": "sha512-2oDT43Y5HWRSIQMPQI4tA/W+TN/N2tjggZCUsqQV440kxzzoPGsvv9QP1GhQ4CoDa+yn6ygUsGp6Dr+a9sPPSg==", + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.52.0.tgz", + "integrity": "sha512-ozBT8J/mtD4H4IAojw8QPirlcL2gHrI1BGuZ4/ZXXO/rTE1yQ4VIPJj4mTTbwo4FbkS1MoJsD/DsrqLzhnc4/g==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1" + "@algolia/client-common": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/@algolia/requester-node-http": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.48.1.tgz", - "integrity": "sha512-xcaCqbhupVWhuBP1nwbk1XNvwrGljozutEiLx06mvqDf3o8cHyEgQSHS4fKJM+UAggaWVnnFW+Nne5aQ8SUJXg==", + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.52.0.tgz", + "integrity": "sha512-gyyWcLD22tnabmoit4iukCXuoRc5HYJuUjPSEa8a0D/f/NlRafpWi52AlAaa4Uu/rsl7saHsJFTNjTptWbu2+A==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/client-common": "5.48.1" + "@algolia/client-common": "5.52.0" }, "engines": { "node": ">= 14.0.0" @@ -361,32 +361,32 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.2102.18", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2102.18.tgz", - "integrity": "sha512-bEkF4ApWa6FJ2+ZyFPdhQr05PgJv/oKwx+3goNRa4lSxzJO+O3KXr0ivTyE5zEJ8l4JdV3h93bsCP54Rk3v7Dw==", + "version": "0.2200.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2200.6.tgz", + "integrity": "sha512-wTjUfiT5iEMc9+9z2zo1QGtzLpXk5Xx0bV6/zTO4n6+BCC0qReuYnIYt0iJCh649Q0vHq5++0zmZZK0KyXVMZQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "21.2.18", + "@angular-devkit/core": "22.0.6", "rxjs": "7.8.2" }, "bin": { "architect": "bin/cli.js" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0", + "node": "^22.22.3 || ^24.15.0 || >=26.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, - "node_modules/@angular-devkit/architect/node_modules/@angular-devkit/core": { - "version": "21.2.18", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.18.tgz", - "integrity": "sha512-783AuDmzAjFkOBHey7cx1mXd8CTiMg9LvG+BCxEp8i4EB7cOGYrq3lBzkwhKJq6yYpz7dNgM1QgeLk+NcrFBSA==", + "node_modules/@angular-devkit/core": { + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-22.0.6.tgz", + "integrity": "sha512-uAZ7TPn+8sDZcFtiM5nQpmqaR9lspLAf7RY7t7TXYP794001khRf+F/AhmONxmgFPWY01+eeJSvBx+FEnHCb0A==", "dev": true, "license": "MIT", "dependencies": { - "ajv": "8.18.0", + "ajv": "8.20.0", "ajv-formats": "3.0.1", "jsonc-parser": "3.3.1", "picomatch": "4.0.4", @@ -394,7 +394,7 @@ "source-map": "0.7.6" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0", + "node": "^22.22.3 || ^24.15.0 || >=26.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, @@ -407,383 +407,132 @@ } } }, - "node_modules/@angular-devkit/architect/node_modules/chokidar": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", - "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "readdirp": "^5.0.0" - }, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@angular-devkit/architect/node_modules/readdirp": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", - "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - }, "node_modules/@angular-devkit/schematics": { - "version": "21.2.18", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-21.2.18.tgz", - "integrity": "sha512-PakHs+Eefx06KORDFyH4wmkIZ/wm4mI4DqhXe4XFuWJOazMQoYJxPmMeby47BD0HhvJN7BskN61CPS8HCAvICg==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-22.0.6.tgz", + "integrity": "sha512-7bSiye4UrxvhYvYp1YIpVSVOFQZ75EXP3EE5/ShM3cPNtUTdXJiwHkD8SiLHNhPTB6Mzrq5tp1YlAXXRg/WgLw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "21.2.18", + "@angular-devkit/core": "22.0.6", "jsonc-parser": "3.3.1", "magic-string": "0.30.21", - "ora": "9.3.0", + "ora": "9.4.0", "rxjs": "7.8.2" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0", + "node": "^22.22.3 || ^24.15.0 || >=26.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, - "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": { - "version": "21.2.18", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.18.tgz", - "integrity": "sha512-783AuDmzAjFkOBHey7cx1mXd8CTiMg9LvG+BCxEp8i4EB7cOGYrq3lBzkwhKJq6yYpz7dNgM1QgeLk+NcrFBSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "8.18.0", - "ajv-formats": "3.0.1", - "jsonc-parser": "3.3.1", - "picomatch": "4.0.4", - "rxjs": "7.8.2", - "source-map": "0.7.6" - }, - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "chokidar": "^5.0.0" - }, - "peerDependenciesMeta": { - "chokidar": { - "optional": true - } - } - }, - "node_modules/@angular-devkit/schematics/node_modules/chokidar": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", - "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "readdirp": "^5.0.0" - }, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@angular-devkit/schematics/node_modules/readdirp": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", - "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - }, "node_modules/@angular-eslint/builder": { - "version": "21.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-21.4.0.tgz", - "integrity": "sha512-3kgGmrVaCYbLtDjC8g4BmMBbdz4thsOB8/NYly8JtXM8EuDZEk5Pz6VTRpJR02ARprwayraTTmhyvq6OGBlQ9w==", + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-22.1.0.tgz", + "integrity": "sha512-gmdk06PK0whNJlapIQjRnhud2/n+oIIDBIoLUHWFFxhHRs+ZstVc6+81gf+sYDOm1Ehmb0V3nZAg3YpT1Mk0Eg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": ">= 0.2100.0 < 0.2200.0", - "@angular-devkit/core": ">= 21.0.0 < 22.0.0" + "@angular-devkit/architect": ">= 0.2200.0 < 0.2300.0", + "@angular-devkit/core": ">= 22.0.0 < 23.0.0" }, "peerDependencies": { - "@angular/cli": ">= 21.0.0 < 22.0.0", - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", + "@angular/cli": ">= 22.0.0 < 23.0.0", + "eslint": "^9.0.0 || ^10.0.0", "typescript": "*" } }, - "node_modules/@angular-eslint/builder/node_modules/@angular-devkit/core": { - "version": "21.2.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.8.tgz", - "integrity": "sha512-DyxCILaaic/hfcfiBjAC/SdKE1ybSQIrU62/K5Msn3gZtThZj/T7cG0VHfbmpEFcgYkrQ9caUt6MCg8OoOVDzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "8.18.0", - "ajv-formats": "3.0.1", - "jsonc-parser": "3.3.1", - "picomatch": "4.0.4", - "rxjs": "7.8.2", - "source-map": "0.7.6" - }, - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "chokidar": "^5.0.0" - }, - "peerDependenciesMeta": { - "chokidar": { - "optional": true - } - } - }, - "node_modules/@angular-eslint/builder/node_modules/chokidar": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", - "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "readdirp": "^5.0.0" - }, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@angular-eslint/builder/node_modules/readdirp": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", - "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "node_modules/@angular-eslint/bundled-angular-compiler": { + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-22.1.0.tgz", + "integrity": "sha512-iOtOQ2jtrtko1rIQo6i+g3ezxGL0lyYv80j4GccFTK1JGh4K+AqYkmaBvfUfNtqoE/7VcKsOoyxaFt6iIpKhaQ==", "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } + "license": "MIT" }, "node_modules/@angular-eslint/eslint-plugin": { - "version": "21.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-21.4.0.tgz", - "integrity": "sha512-mow2DMj+xBvGl5t7jzC34R8YfbHbaGNyCNFzpovtl9qc0JbuqLyg6htmt8xb05f8ZjATOr4nz0ESt6HV4c51hw==", + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-22.1.0.tgz", + "integrity": "sha512-nRwdbUiW7vF0gbwtxw2hRGPZYZCNWOTLZKw4HM+I37o5YFIA0CFLtbyRKgZWs6JZCIqzTYSwCyKNsW41Qw0FwQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "21.4.0", - "@angular-eslint/utils": "21.4.0", + "@angular-eslint/bundled-angular-compiler": "22.1.0", + "@angular-eslint/utils": "22.1.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { - "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", + "@typescript-eslint/utils": "^8.0.0", + "eslint": "^9.0.0 || ^10.0.0", "typescript": "*" } }, "node_modules/@angular-eslint/eslint-plugin-template": { - "version": "21.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-21.4.0.tgz", - "integrity": "sha512-sJEHx2WYnvOgPpzP1eHnUdRS06zgKmRxbiIR0JiCcaSen5iv1HlsMieXy//FS9TtNW+abHOy4UtDuGuSPflPFA==", + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-22.1.0.tgz", + "integrity": "sha512-GK/Mwhwvj+MX6DefD29/IfuYjcai5CsCbYJ6Qb9P6IAzZaQqw+EN+CiXxIwzMnzm2edLcJzAsX8iBk4X7sVi2Q==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "21.4.0", - "@angular-eslint/utils": "21.4.0", + "@angular-eslint/bundled-angular-compiler": "22.1.0", + "@angular-eslint/utils": "22.1.0", "aria-query": "5.3.2", "axobject-query": "4.1.0" }, "peerDependencies": { - "@angular-eslint/template-parser": "21.4.0", - "@typescript-eslint/types": "^7.11.0 || ^8.0.0", - "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": "*" - } - }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "21.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-21.4.0.tgz", - "integrity": "sha512-/3H4BPbQ1BHJkkrUsfusZtmHc+qiFWBBZ9UDPWah4xZMjflexOK9U4GYeH7nMjcuyqFnIlMMeJJNwNLGt/hmdg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@angular-eslint/utils": { - "version": "21.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-21.4.0.tgz", - "integrity": "sha512-7pi+Ga7QmdH5Ig/diau6fR5L4yubgKr9TOjdCg7OeuE/zo0O3osTCNT6JOodzS/iQM1kSCJFDoIBKFeUOttiNw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@angular-eslint/bundled-angular-compiler": "21.4.0" - }, - "peerDependencies": { - "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": "*" - } - }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "21.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-21.4.0.tgz", - "integrity": "sha512-/3H4BPbQ1BHJkkrUsfusZtmHc+qiFWBBZ9UDPWah4xZMjflexOK9U4GYeH7nMjcuyqFnIlMMeJJNwNLGt/hmdg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@angular-eslint/utils": { - "version": "21.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-21.4.0.tgz", - "integrity": "sha512-7pi+Ga7QmdH5Ig/diau6fR5L4yubgKr9TOjdCg7OeuE/zo0O3osTCNT6JOodzS/iQM1kSCJFDoIBKFeUOttiNw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@angular-eslint/bundled-angular-compiler": "21.4.0" - }, - "peerDependencies": { - "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", + "@angular-eslint/template-parser": "22.1.0", + "@typescript-eslint/types": "^8.0.0", + "@typescript-eslint/utils": "^8.0.0", + "eslint": "^9.0.0 || ^10.0.0", "typescript": "*" } }, "node_modules/@angular-eslint/schematics": { - "version": "21.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-21.4.0.tgz", - "integrity": "sha512-crD6Hfxs7x5bN9FCqTZI7uVSiGvprfCS3MCPOpyIQl87bRr/9aNhnicJ3ROUHv+2A713BgPHIgiCII/bxzrfPw==", + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-22.1.0.tgz", + "integrity": "sha512-/Z7MEO9ys9P5w5itM2mpNW4R/QNAVxtDdcU5LVFulSx/lo7zCDx1rZ/tLDuzbN5k5RGQy5ZkdRIs0MoscsGXQQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": ">= 21.0.0 < 22.0.0", - "@angular-devkit/schematics": ">= 21.0.0 < 22.0.0", - "@angular-eslint/eslint-plugin": "21.4.0", - "@angular-eslint/eslint-plugin-template": "21.4.0", + "@angular-devkit/core": ">= 22.0.0 < 23.0.0", + "@angular-devkit/schematics": ">= 22.0.0 < 23.0.0", + "@angular-eslint/eslint-plugin": "22.1.0", + "@angular-eslint/eslint-plugin-template": "22.1.0", "ignore": "7.0.5", - "semver": "7.7.4", + "semver": "7.8.5", "strip-json-comments": "3.1.1" }, "peerDependencies": { - "@angular/cli": ">= 21.0.0 < 22.0.0" - } - }, - "node_modules/@angular-eslint/schematics/node_modules/@angular-devkit/core": { - "version": "21.2.8", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.8.tgz", - "integrity": "sha512-DyxCILaaic/hfcfiBjAC/SdKE1ybSQIrU62/K5Msn3gZtThZj/T7cG0VHfbmpEFcgYkrQ9caUt6MCg8OoOVDzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "8.18.0", - "ajv-formats": "3.0.1", - "jsonc-parser": "3.3.1", - "picomatch": "4.0.4", - "rxjs": "7.8.2", - "source-map": "0.7.6" - }, - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "chokidar": "^5.0.0" - }, - "peerDependenciesMeta": { - "chokidar": { - "optional": true - } + "@angular/cli": ">= 22.0.0 < 23.0.0" } }, - "node_modules/@angular-eslint/schematics/node_modules/chokidar": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", - "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "node_modules/@angular-eslint/schematics/node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "readdirp": "^5.0.0" - }, - "engines": { - "node": ">= 20.19.0" + "license": "ISC", + "bin": { + "semver": "bin/semver.js" }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@angular-eslint/schematics/node_modules/readdirp": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", - "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" + "node": ">=10" } }, "node_modules/@angular-eslint/template-parser": { - "version": "21.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-21.4.0.tgz", - "integrity": "sha512-BaUSLSyS+43fzDoJkTMkGqNdCXq3fGnUZsfXTmrlZPJf5AYFbgAlAPGZXDJyoNWw43fux+DafdlrlKcYUSgSIw==", + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-22.1.0.tgz", + "integrity": "sha512-gcufZLI/Rl2fOWtBk2MgMRkH1t+OrbJGxIsfT0w3pVjKm0zwi7njM/dtPbVjCHzsGhx7szQMvY0i0UwTBVYkSw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "21.4.0", + "@angular-eslint/bundled-angular-compiler": "22.1.0", "eslint-scope": "9.1.2" }, "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", + "eslint": "^9.0.0 || ^10.0.0", "typescript": "*" } }, - "node_modules/@angular-eslint/template-parser/node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "21.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-21.4.0.tgz", - "integrity": "sha512-/3H4BPbQ1BHJkkrUsfusZtmHc+qiFWBBZ9UDPWah4xZMjflexOK9U4GYeH7nMjcuyqFnIlMMeJJNwNLGt/hmdg==", - "dev": true, - "license": "MIT" - }, "node_modules/@angular-eslint/template-parser/node_modules/eslint-scope": { "version": "9.1.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz", @@ -803,81 +552,95 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/@angular-eslint/utils": { + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-22.1.0.tgz", + "integrity": "sha512-zDPJqgOxlkG20UJWsVDSvnEtC2MfIP0+yKMaQUBL+2nrEknV/fVLrz7ApnerWiDrGTcAms5si49KV10MarMpRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "22.1.0" + }, + "peerDependencies": { + "@typescript-eslint/utils": "^8.0.0", + "eslint": "^9.0.0 || ^10.0.0", + "typescript": "*" + } + }, "node_modules/@angular/animations": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-21.2.17.tgz", - "integrity": "sha512-zOW8FFa9qfbVkZ5TulxDkl1C3+gEjWfAAD5Z2MycA6pjVJQlLYPiTAGq+flOQ3yZfTT0z6kd5rejQMXWI81Dvg==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-22.0.6.tgz", + "integrity": "sha512-5bBAuKtawVK4KPq6U/yoE5yCyKymEnXNN7UJ1Lb7PUuuYmLnUXb7zJpC7HwtHTuV/0PTCkGlLE59NtcrrolTuA==", "deprecated": "@angular/animations is deprecated. Use `animate.enter` and `animate.leave` instead. For more information see: https://v22.angular.dev/guide/animations.", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/core": "21.2.17" + "@angular/core": "22.0.6" } }, "node_modules/@angular/build": { - "version": "21.2.18", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-21.2.18.tgz", - "integrity": "sha512-9Jic0Dud6d0ULPR5SceHV86AzZE42cNWPsbLKrK1dUneaAC44GSVRTmLXcaSX/5Exa3gGjFANQw4qashgxUekQ==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-22.0.6.tgz", + "integrity": "sha512-mIp1snH1haw4pKiJwUmKyp9f31NRUTeUwqrl9W59X3Iv54egOnD1EdCc0jsW7WJVr/JHRZYVt/ooFelUB8uV8g==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.2102.18", - "@babel/core": "7.29.7", + "@angular-devkit/architect": "0.2200.6", + "@babel/core": "7.29.0", "@babel/helper-annotate-as-pure": "7.27.3", "@babel/helper-split-export-declaration": "7.24.7", - "@inquirer/confirm": "5.1.21", - "@vitejs/plugin-basic-ssl": "2.1.4", - "beasties": "0.4.1", + "@inquirer/confirm": "6.0.12", + "@vitejs/plugin-basic-ssl": "2.3.0", + "beasties": "0.4.2", "browserslist": "^4.26.0", "esbuild": "0.28.1", - "https-proxy-agent": "7.0.6", - "istanbul-lib-instrument": "6.0.3", + "https-proxy-agent": "9.0.0", "jsonc-parser": "3.3.1", - "listr2": "9.0.5", + "listr2": "10.2.1", "magic-string": "0.30.21", "mrmime": "2.0.1", - "parse5-html-rewriting-stream": "8.0.0", + "parse5-html-rewriting-stream": "8.0.1", "picomatch": "4.0.4", "piscina": "5.2.0", - "rolldown": "1.0.0-rc.4", - "sass": "1.97.3", + "rollup": "4.60.2", + "sass": "1.99.0", "semver": "7.7.4", "source-map-support": "0.5.21", - "tinyglobby": "0.2.15", - "undici": "7.28.0", - "vite": "7.3.6", + "tinyglobby": "0.2.16", + "vite": "7.3.5", "watchpack": "2.5.1" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0", + "node": "^22.22.3 || ^24.15.0 || >=26.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, "optionalDependencies": { - "lmdb": "3.5.1" + "lmdb": "3.5.4" }, "peerDependencies": { - "@angular/compiler": "^21.0.0", - "@angular/compiler-cli": "^21.0.0", - "@angular/core": "^21.0.0", - "@angular/localize": "^21.0.0", - "@angular/platform-browser": "^21.0.0", - "@angular/platform-server": "^21.0.0", - "@angular/service-worker": "^21.0.0", - "@angular/ssr": "^21.2.18", + "@angular/compiler": "^22.0.0", + "@angular/compiler-cli": "^22.0.0", + "@angular/core": "^22.0.0", + "@angular/localize": "^22.0.0", + "@angular/platform-browser": "^22.0.0", + "@angular/platform-server": "^22.0.0", + "@angular/service-worker": "^22.0.0", + "@angular/ssr": "^22.0.6", + "istanbul-lib-instrument": "^6.0.0", "karma": "^6.4.0", "less": "^4.2.0", - "ng-packagr": "^21.0.0", + "ng-packagr": "^22.0.0", "postcss": "^8.4.0", "tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0", "tslib": "^2.3.0", - "typescript": ">=5.9 <6.0", + "typescript": ">=6.0 <6.1", "vitest": "^4.0.8" }, "peerDependenciesMeta": { @@ -899,6 +662,9 @@ "@angular/ssr": { "optional": true }, + "istanbul-lib-instrument": { + "optional": true + }, "karma": { "optional": true }, @@ -919,47 +685,6 @@ } } }, - "node_modules/@angular/build/node_modules/@babel/core": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz", - "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.29.7", - "@babel/generator": "^7.29.7", - "@babel/helper-compilation-targets": "^7.29.7", - "@babel/helper-module-transforms": "^7.29.7", - "@babel/helpers": "^7.29.7", - "@babel/parser": "^7.29.7", - "@babel/template": "^7.29.7", - "@babel/traverse": "^7.29.7", - "@babel/types": "^7.29.7", - "@jridgewell/remapping": "^2.3.5", - "convert-source-map": "^2.0.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@angular/build/node_modules/@babel/core/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@angular/build/node_modules/@esbuild/aix-ppc64": { "version": "0.28.1", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz", @@ -1402,12 +1127,15 @@ "node": ">=18" } }, - "node_modules/@angular/build/node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "node_modules/@angular/build/node_modules/agent-base": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-9.0.0.tgz", + "integrity": "sha512-TQf59BsZnytt8GdJKLPfUZ54g/iaUL2OWDSFCCvMOhsHduDQxO8xC4PNeyIkVcA5KwL2phPSv0douC0fgWzmnA==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">= 20" + } }, "node_modules/@angular/build/node_modules/esbuild": { "version": "0.28.1", @@ -1451,155 +1179,107 @@ "@esbuild/win32-x64": "0.28.1" } }, + "node_modules/@angular/build/node_modules/https-proxy-agent": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-9.0.0.tgz", + "integrity": "sha512-/MVmHp58WkOypgFhCLk4fzpPcFQvTJ/e6LBI7irpIO2HfxUbpmYoHF+KzipzJpxxzJu7aJNWQ0xojJ/dzV2G5g==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "9.0.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 20" + } + }, "node_modules/@angular/cdk": { - "version": "21.2.14", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-21.2.14.tgz", - "integrity": "sha512-806REq/CLf37nEhmmd8Q+ILN8z/RVG2vk2n8YZ/4TdHpcBCi5ux4AxLbpMmduLwGPOzPagJ6ggRzE5fnX0rmcQ==", + "version": "22.0.4", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-22.0.4.tgz", + "integrity": "sha512-XaH1ff9tOn4acPh0zWbrmJznfZqZ0KZkw5+DM5BIeM9URmAOI8xdZWmVNyaUpVSmriANFjeGZS+Sfat9S6hLOg==", "license": "MIT", "dependencies": { "parse5": "^8.0.0", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^21.0.0 || ^22.0.0", - "@angular/core": "^21.0.0 || ^22.0.0", - "@angular/platform-browser": "^21.0.0 || ^22.0.0", + "@angular/common": "^22.0.0 || ^23.0.0", + "@angular/core": "^22.0.0 || ^23.0.0", + "@angular/platform-browser": "^22.0.0 || ^23.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/cli": { - "version": "21.2.18", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-21.2.18.tgz", - "integrity": "sha512-WOZF4p0SnrmBpNeiOA2pdp9OBvGnOSLWbGdRLXJykyseIiEn7+N+GZp+ZA1aNZB4SWolpYCZfTYwkpo6Sf/LXg==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-22.0.6.tgz", + "integrity": "sha512-/sEN1hVcywSML+yWrr/T7gbuGfIrZwKC+WhiOv5GksSQVUrSujWnMX4meRJ5ocG/Ie8UN48LJ7LVDsm32NBt1A==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.2102.18", - "@angular-devkit/core": "21.2.18", - "@angular-devkit/schematics": "21.2.18", - "@inquirer/prompts": "7.10.1", - "@listr2/prompt-adapter-inquirer": "3.0.5", - "@modelcontextprotocol/sdk": "1.26.0", - "@schematics/angular": "21.2.18", + "@angular-devkit/architect": "0.2200.6", + "@angular-devkit/core": "22.0.6", + "@angular-devkit/schematics": "22.0.6", + "@inquirer/prompts": "8.4.2", + "@listr2/prompt-adapter-inquirer": "4.2.3", + "@modelcontextprotocol/sdk": "1.29.0", + "@schematics/angular": "22.0.6", "@yarnpkg/lockfile": "1.1.0", - "algoliasearch": "5.48.1", + "algoliasearch": "5.52.0", "ini": "6.0.0", "jsonc-parser": "3.3.1", - "listr2": "9.0.5", + "listr2": "10.2.1", "npm-package-arg": "13.0.2", "pacote": "21.5.1", - "parse5-html-rewriting-stream": "8.0.0", + "parse5-html-rewriting-stream": "8.0.1", "semver": "7.7.4", "yargs": "18.0.0", - "zod": "4.3.6" + "zod": "4.4.2" }, "bin": { "ng": "bin/ng.js" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - } - }, - "node_modules/@angular/cli/node_modules/@angular-devkit/core": { - "version": "21.2.18", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.18.tgz", - "integrity": "sha512-783AuDmzAjFkOBHey7cx1mXd8CTiMg9LvG+BCxEp8i4EB7cOGYrq3lBzkwhKJq6yYpz7dNgM1QgeLk+NcrFBSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "8.18.0", - "ajv-formats": "3.0.1", - "jsonc-parser": "3.3.1", - "picomatch": "4.0.4", - "rxjs": "7.8.2", - "source-map": "0.7.6" - }, - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0", + "node": "^22.22.3 || ^24.15.0 || >=26.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "chokidar": "^5.0.0" - }, - "peerDependenciesMeta": { - "chokidar": { - "optional": true - } - } - }, - "node_modules/@angular/cli/node_modules/chokidar": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", - "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "readdirp": "^5.0.0" - }, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@angular/cli/node_modules/readdirp": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", - "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" } }, "node_modules/@angular/common": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-21.2.17.tgz", - "integrity": "sha512-hqAQxRfi5ldFE42suAXRcY+JCANrUh7fuSQ/DtZ7L896id5BT/exuv6dWNBC1PyAfQmRbpD5Pt6/pd+tNLyhDQ==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-22.0.6.tgz", + "integrity": "sha512-+sC0W0FWGeZ/HKUhueCBX8kXdFQDlStbUSK6WF/32igfNYR/PdUrp2L5bU7q654yjxnMzFWDAB+Uvzv6YI/cQg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/core": "21.2.17", + "@angular/core": "22.0.6", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-21.2.17.tgz", - "integrity": "sha512-p+NdjYiwAz9Zmu2yul0LlMXaFjMISVVa24+/MVMoKFeQeI82QE8jDywPlnOSHQHvdCcQVpS7saeEriZzX3JuBQ==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-22.0.6.tgz", + "integrity": "sha512-iFHsXOA14TsxK4jowmGfogI9Jb0ApL3z8EGTGvKMialqtw088HYjwJP1LT4OlO/wgmjSTq2peZ19jLPuhevNvw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.22.3 || ^24.15.0 || >=26.0.0" } }, "node_modules/@angular/compiler-cli": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-21.2.17.tgz", - "integrity": "sha512-KithZ3b0HBFH0NbUcswBcjpN9y09vLbarMD7qmGWTnGUBk4W8cn4sbT8zJyv9CRKg9ZcuUBeJYKUfUPn/u/5OQ==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-22.0.6.tgz", + "integrity": "sha512-HPiceCIEyIcTmOuIFiyqu04kbLoJhSUavcOy/kzJkJ2OPXtPvGKaimC4lgs0C86uFy4P6rj6PDITBe3AVHkMTA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/core": "7.29.0", + "@babel/core": "7.29.7", "@jridgewell/sourcemap-codec": "^1.4.14", "chokidar": "^5.0.0", "convert-source-map": "^1.5.1", @@ -1613,11 +1293,11 @@ "ngc": "bundles/src/bin/ngc.js" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/compiler": "21.2.17", - "typescript": ">=5.9 <6.1" + "@angular/compiler": "22.0.6", + "typescript": ">=6.0 <6.1" }, "peerDependenciesMeta": { "typescript": { @@ -1625,49 +1305,67 @@ } } }, - "node_modules/@angular/compiler-cli/node_modules/chokidar": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", - "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "node_modules/@angular/compiler-cli/node_modules/@babel/core": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz", + "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", "dev": true, "license": "MIT", "dependencies": { - "readdirp": "^5.0.0" + "@babel/code-frame": "^7.29.7", + "@babel/generator": "^7.29.7", + "@babel/helper-compilation-targets": "^7.29.7", + "@babel/helper-module-transforms": "^7.29.7", + "@babel/helpers": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/template": "^7.29.7", + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7", + "@jridgewell/remapping": "^2.3.5", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" }, "engines": { - "node": ">= 20.19.0" + "node": ">=6.9.0" }, "funding": { - "url": "https://paulmillr.com/funding/" + "type": "opencollective", + "url": "https://opencollective.com/babel" } }, - "node_modules/@angular/compiler-cli/node_modules/readdirp": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", - "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", + "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true, - "license": "MIT", - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" + "license": "MIT" + }, + "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" } }, "node_modules/@angular/core": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-21.2.17.tgz", - "integrity": "sha512-wYHpwIdnUnjQFOJJNqRcGx7LS3u64jT+R9L0TnMR/ViBM9dQgGYImlSikkftg2yrFCNo5aKRxhG2LLskQurVdg==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-22.0.6.tgz", + "integrity": "sha512-9AYGxmZlJhjLSepZaF/cn1LTC9xRHpUPtXlyyJdauTb4f77X/P0kVdmADztgF1Qy5oMd1V9UKebAe81gmqOH2g==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/compiler": "21.2.17", + "@angular/compiler": "22.0.6", "rxjs": "^6.5.3 || ^7.4.0", "zone.js": "~0.15.0 || ~0.16.0" }, @@ -1681,97 +1379,98 @@ } }, "node_modules/@angular/forms": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-21.2.17.tgz", - "integrity": "sha512-WKu8XeRSNZo+a+aDDZ3M5OtReF7KYqR/PmZ2l1lSf6N5EEAmc+Ky4aqbRhTL/mTSfHrO4+TDJ4C5A2tFmuwIeA==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-22.0.6.tgz", + "integrity": "sha512-pZGMk1TvT+m8z2ZGm90W0sBlo6fhtMAA2baZbMt3HbGRmY23vZv1Orv9npX3Z6a9CCNDY3XBMBvkuj8g7vde9Q==", "license": "MIT", "dependencies": { "@standard-schema/spec": "^1.0.0", - "tslib": "^2.3.0" + "tslib": "^2.3.0", + "zod": "^4.0.10" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/common": "21.2.17", - "@angular/core": "21.2.17", - "@angular/platform-browser": "21.2.17", + "@angular/common": "22.0.6", + "@angular/core": "22.0.6", + "@angular/platform-browser": "22.0.6", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/language-server": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/language-server/-/language-server-21.2.17.tgz", - "integrity": "sha512-6x/BQfYSKsjB2vVF0TJ2fkB2m8wRLykaPLrUaYA2bSEtIOCI4x+8vR/nELOkyRXXZB7CtsEqX2tv89ZK7eV0TA==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/language-server/-/language-server-22.0.6.tgz", + "integrity": "sha512-3wLhBdF/9GgW7Y4fKyW7e9TKyRC2firP9akb6Xd1TajqQzDxExdbKo+bBLML+njKWcOCknUAqR6OBNpDl/IrPA==", "dev": true, "license": "MIT", "dependencies": { - "@angular/language-service": "21.2.17", - "typescript": "5.9.3" + "@angular/language-service": "22.0.6", + "typescript": "6.0.3" }, "bin": { "ngserver": "bin/ngserver" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.22.3 || ^24.15.0 || >=26.0.0" } }, "node_modules/@angular/language-service": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-21.2.17.tgz", - "integrity": "sha512-Pq0V7VBkShQThA6QME2FjZgHLuxFpsioEoppx1i8rHFTGoJuXtBJK8iaArF7XuYaMzMRInUGfMQzsXc2WE+rmg==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-22.0.6.tgz", + "integrity": "sha512-98+yuUDyt472Z5vUEQs2YFqeF+ET2YQIWsdbhp9gTAE/oCEfnPTV9iyvqqry79UpBH0ivGeBs2ISD1QUkKsWrA==", "dev": true, "license": "MIT", "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.22.3 || ^24.15.0 || >=26.0.0" } }, "node_modules/@angular/material": { - "version": "21.2.14", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-21.2.14.tgz", - "integrity": "sha512-fMQca8VRtei93JRRG9qQ+u08DCb0nga59Esoakq5yx3+A1NfdpFeUS1tBns56U04o8KAaIAwZK3NBqXz8ZKNqg==", + "version": "22.0.4", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-22.0.4.tgz", + "integrity": "sha512-htOFlTwMtcB9J4q6yPD9jJIQVJ5LfRub+KAiD4D7UU1iaCknpNuQKRfLrZh/mEdOVACI52jHAOXS3+eTkloXcQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/cdk": "21.2.14", - "@angular/common": "^21.0.0 || ^22.0.0", - "@angular/core": "^21.0.0 || ^22.0.0", - "@angular/forms": "^21.0.0 || ^22.0.0", - "@angular/platform-browser": "^21.0.0 || ^22.0.0", + "@angular/cdk": "22.0.4", + "@angular/common": "^22.0.0 || ^23.0.0", + "@angular/core": "^22.0.0 || ^23.0.0", + "@angular/forms": "^22.0.0 || ^23.0.0", + "@angular/platform-browser": "^22.0.0 || ^23.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/material-date-fns-adapter": { - "version": "21.2.14", - "resolved": "https://registry.npmjs.org/@angular/material-date-fns-adapter/-/material-date-fns-adapter-21.2.14.tgz", - "integrity": "sha512-PvfX/Y+6ml8G+Zacgmp52nerI4fQmPtCKPDweUVA5Drm8Ygoo3zdVS9UnB+74KuH56I+AS5IZ8usJSwdV+z1UQ==", + "version": "22.0.4", + "resolved": "https://registry.npmjs.org/@angular/material-date-fns-adapter/-/material-date-fns-adapter-22.0.4.tgz", + "integrity": "sha512-0TZf1eByXqPbDyXldzqxF4PSPw/x1HtjpBdKVe4QjXFxlFVaSymRWr+Xwks0UVL+QzddZWk8TS+dcU462eeZ6g==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/core": "^21.0.0 || ^22.0.0", - "@angular/material": "21.2.14", + "@angular/core": "^22.0.0 || ^23.0.0", + "@angular/material": "22.0.4", "date-fns": ">2.20.0 <5.0" } }, "node_modules/@angular/platform-browser": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-21.2.17.tgz", - "integrity": "sha512-ROdSliejY37g1EphYmweYdm5cHM8HY3X4tbWt4ubxmhTyYgfN3nxrxfGQ/n7Mz5tDY9VXVLIGDgjLOGYOo4uTQ==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-22.0.6.tgz", + "integrity": "sha512-DyyYRx4jXlfaenf0mwsp9jcIak/c17QCFgJKA7OauSkQnk3dL+voMYEwdigfnTIUdw+2Y9wYDywLeuM6NychNQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/animations": "21.2.17", - "@angular/common": "21.2.17", - "@angular/core": "21.2.17" + "@angular/animations": "22.0.6", + "@angular/common": "22.0.6", + "@angular/core": "22.0.6" }, "peerDependenciesMeta": { "@angular/animations": { @@ -1780,45 +1479,46 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-21.2.17.tgz", - "integrity": "sha512-r/BU/T8bOTghP3fIXhzYf5wcMcAmhWnAFv3p4asCCPXomaktoas70wYcMaDH+pK1LAFBxLwzBWHm36MpFlTMFg==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-22.0.6.tgz", + "integrity": "sha512-VKf8mg+BviBp3wlElZYxWFuXtMLQqd8rfm6jEzwP1Emaz2MCx69Y54dXopD81KJCqRwTmJUVxOjoubqUOlJzRw==", + "deprecated": "@angular/platform-browser-dynamic is deprecated. Use `@angular/platform-browser` instead.", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/common": "21.2.17", - "@angular/compiler": "21.2.17", - "@angular/core": "21.2.17", - "@angular/platform-browser": "21.2.17" + "@angular/common": "22.0.6", + "@angular/compiler": "22.0.6", + "@angular/core": "22.0.6", + "@angular/platform-browser": "22.0.6" } }, "node_modules/@angular/router": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-21.2.17.tgz", - "integrity": "sha512-RSCtK5ppAV6y6wfRLHSK2a9Wc/vm8j0wsC+/j9PH9yQmppWFVXDWsg5E39MKOIpnoYVx2+hI6eak6+wYtZTe1A==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-22.0.6.tgz", + "integrity": "sha512-s0BErBBadCXlvilob8aWke4H1FRlXDbnDfyYkjW6RkUaGQ4jzeEAzH56KsG2hf8NtBtYwkRlsLfOX9s5sPwm6w==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/common": "21.2.17", - "@angular/core": "21.2.17", - "@angular/platform-browser": "21.2.17", + "@angular/common": "22.0.6", + "@angular/core": "22.0.6", + "@angular/platform-browser": "22.0.6", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/service-worker": { - "version": "21.2.17", - "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-21.2.17.tgz", - "integrity": "sha512-6/uKwxBA3udngVHuIVqD8kdMV1whfym9ESB1UyjoNINx+2zj7A749X89tiV0TW2CvWpUYUE7VxpoapEiv5lvfw==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-22.0.6.tgz", + "integrity": "sha512-s0zE2MFVptHNd21c5sD2VXd9Dp5x6cgyDjIePKjRsfiILegX3i6pAj9xeZ6y160dsrLVmkHST+uY+oxOVMVUhg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -1827,10 +1527,10 @@ "ngsw-config": "ngsw-config.js" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/core": "21.2.17", + "@angular/core": "22.0.6", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -2162,18 +1862,17 @@ } }, "node_modules/@coreui/angular-chartjs": { - "version": "5.6.25", - "resolved": "https://registry.npmjs.org/@coreui/angular-chartjs/-/angular-chartjs-5.6.25.tgz", - "integrity": "sha512-xab538rl0b5xfRJjQqYspZ/NoJqrwqcVBpoR4o1C9ZEGyMrSc34O+nzjjUIoFeO+TY8ktGz517gunKFVfn6NZw==", - "dev": true, + "version": "5.7.3", + "resolved": "https://registry.npmjs.org/@coreui/angular-chartjs/-/angular-chartjs-5.7.3.tgz", + "integrity": "sha512-2YmX+sPK8JMrpTvoESA4hL5+5jGKWcd6cet+quelz1BOTBOM5EwT00uLXkvTyorvBPma1SJp5eANhwYKF7RhKg==", "license": "MIT", "dependencies": { "lodash-es": "^4.18.1", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/core": "^21.2.17", - "@coreui/chartjs": "^4.1.0", + "@angular/core": "^22.0.0", + "@coreui/chartjs": "^4.2.0", "chart.js": "^4.5.0" } }, @@ -2235,44 +1934,10 @@ "integrity": "sha512-lwYN/vDPeNRULcepoE/LO2Pgx+7/RV+S9ARfbc9lr2DtGkOD7pAiruHvbR1RX3Qyf6ja47EWJDMsNK5vK08DJg==", "license": "MIT" }, - "node_modules/@emnapi/core": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz", - "integrity": "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/wasi-threads": "1.1.0", - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/runtime": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.8.1.tgz", - "integrity": "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/wasi-threads": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz", - "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.3.tgz", - "integrity": "sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz", + "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==", "cpu": [ "ppc64" ], @@ -2287,9 +1952,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.3.tgz", - "integrity": "sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz", + "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==", "cpu": [ "arm" ], @@ -2304,9 +1969,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.3.tgz", - "integrity": "sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz", + "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==", "cpu": [ "arm64" ], @@ -2321,9 +1986,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.3.tgz", - "integrity": "sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz", + "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==", "cpu": [ "x64" ], @@ -2338,9 +2003,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.3.tgz", - "integrity": "sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz", + "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==", "cpu": [ "arm64" ], @@ -2355,9 +2020,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.3.tgz", - "integrity": "sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz", + "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==", "cpu": [ "x64" ], @@ -2372,9 +2037,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.3.tgz", - "integrity": "sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz", + "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==", "cpu": [ "arm64" ], @@ -2389,9 +2054,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.3.tgz", - "integrity": "sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz", + "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==", "cpu": [ "x64" ], @@ -2406,9 +2071,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.3.tgz", - "integrity": "sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz", + "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==", "cpu": [ "arm" ], @@ -2423,9 +2088,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.3.tgz", - "integrity": "sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz", + "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==", "cpu": [ "arm64" ], @@ -2440,9 +2105,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.3.tgz", - "integrity": "sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz", + "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==", "cpu": [ "ia32" ], @@ -2457,9 +2122,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.3.tgz", - "integrity": "sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz", + "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==", "cpu": [ "loong64" ], @@ -2474,9 +2139,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.3.tgz", - "integrity": "sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz", + "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==", "cpu": [ "mips64el" ], @@ -2491,9 +2156,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.3.tgz", - "integrity": "sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz", + "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==", "cpu": [ "ppc64" ], @@ -2508,9 +2173,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.3.tgz", - "integrity": "sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz", + "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==", "cpu": [ "riscv64" ], @@ -2525,9 +2190,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.3.tgz", - "integrity": "sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz", + "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==", "cpu": [ "s390x" ], @@ -2542,9 +2207,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.3.tgz", - "integrity": "sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz", + "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==", "cpu": [ "x64" ], @@ -2559,9 +2224,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.3.tgz", - "integrity": "sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz", + "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==", "cpu": [ "arm64" ], @@ -2576,9 +2241,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.3.tgz", - "integrity": "sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz", + "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==", "cpu": [ "x64" ], @@ -2593,9 +2258,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.3.tgz", - "integrity": "sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz", + "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==", "cpu": [ "arm64" ], @@ -2610,9 +2275,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.3.tgz", - "integrity": "sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz", + "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==", "cpu": [ "x64" ], @@ -2627,9 +2292,9 @@ } }, "node_modules/@esbuild/openharmony-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.3.tgz", - "integrity": "sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz", + "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==", "cpu": [ "arm64" ], @@ -2644,9 +2309,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.3.tgz", - "integrity": "sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz", + "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==", "cpu": [ "x64" ], @@ -2661,9 +2326,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.3.tgz", - "integrity": "sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz", + "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==", "cpu": [ "arm64" ], @@ -2678,9 +2343,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.3.tgz", - "integrity": "sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz", + "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==", "cpu": [ "ia32" ], @@ -2695,9 +2360,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.3.tgz", - "integrity": "sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz", + "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==", "cpu": [ "x64" ], @@ -3099,30 +2764,29 @@ } }, "node_modules/@inquirer/ansi": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-1.0.2.tgz", - "integrity": "sha512-S8qNSZiYzFd0wAcyG5AXCvUHC5Sr7xpZ9wZ2py9XR88jUz8wooStVx5M6dRzczbBWjic9NP7+rY0Xi7qqK/aMQ==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-2.0.7.tgz", + "integrity": "sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q==", "dev": true, "license": "MIT", "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" } }, "node_modules/@inquirer/checkbox": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.3.2.tgz", - "integrity": "sha512-VXukHf0RR1doGe6Sm4F0Em7SWYLTHSsbGfJdS9Ja2bX5/D5uwVOEjr07cncLROdBvmnvCATYEWlHqYmXv2IlQA==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-5.2.1.tgz", + "integrity": "sha512-b6xmA/VlTe0ZgDQHDui+Nav470u7u49nRd8/iuhOcQPO9Ch7lGuogydhi2VOmNlZ+zXcM8IcPuNSwQcdJaF/kw==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^1.0.2", - "@inquirer/core": "^10.3.2", - "@inquirer/figures": "^1.0.15", - "@inquirer/type": "^3.0.10", - "yoctocolors-cjs": "^2.1.3" + "@inquirer/ansi": "^2.0.7", + "@inquirer/core": "^11.2.1", + "@inquirer/figures": "^2.0.7", + "@inquirer/type": "^4.0.7" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3134,17 +2798,17 @@ } }, "node_modules/@inquirer/confirm": { - "version": "5.1.21", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.21.tgz", - "integrity": "sha512-KR8edRkIsUayMXV+o3Gv+q4jlhENF9nMYUZs9PA2HzrXeHI8M5uDag70U7RJn9yyiMZSbtF5/UexBtAVtZGSbQ==", + "version": "6.0.12", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-6.0.12.tgz", + "integrity": "sha512-h9FgGun3QwVYNj5TWIZZ+slii73bMoBFjPfVIGtnFuL4t8gBiNDV9PcSfIzkuxvgquJKt9nr1QzszpBzTbH8Og==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.3.2", - "@inquirer/type": "^3.0.10" + "@inquirer/core": "^11.1.9", + "@inquirer/type": "^4.0.5" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3156,23 +2820,22 @@ } }, "node_modules/@inquirer/core": { - "version": "10.3.2", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.3.2.tgz", - "integrity": "sha512-43RTuEbfP8MbKzedNqBrlhhNKVwoK//vUFNW3Q3vZ88BLcrs4kYpGg+B2mm5p2K/HfygoCxuKwJJiv8PbGmE0A==", + "version": "11.2.1", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-11.2.1.tgz", + "integrity": "sha512-Qd6GJT1yVyrZZCfN8W2qKF5ApmqryXRhRKCuip8h01x2w/esJQ2XIYc6f9abMIHgKQdBfFTSOdbHRLAhuM09UA==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^1.0.2", - "@inquirer/figures": "^1.0.15", - "@inquirer/type": "^3.0.10", + "@inquirer/ansi": "^2.0.7", + "@inquirer/figures": "^2.0.7", + "@inquirer/type": "^4.0.7", "cli-width": "^4.1.0", - "mute-stream": "^2.0.0", - "signal-exit": "^4.1.0", - "wrap-ansi": "^6.2.0", - "yoctocolors-cjs": "^2.1.3" + "fast-wrap-ansi": "^0.2.0", + "mute-stream": "^3.0.0", + "signal-exit": "^4.1.0" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3184,18 +2847,18 @@ } }, "node_modules/@inquirer/editor": { - "version": "4.2.23", - "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.23.tgz", - "integrity": "sha512-aLSROkEwirotxZ1pBaP8tugXRFCxW94gwrQLxXfrZsKkfjOYC1aRvAZuhpJOb5cu4IBTJdsCigUlf2iCOu4ZDQ==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-5.2.2.tgz", + "integrity": "sha512-ZRVd/oD+sYsUd5zVm0NflqEzlqfYCyHNsqkHl2oWXEUHs12tCbcSFi+wVFEvD8+LGRaMUsVrE7qeo6lSG/S1Vg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.3.2", - "@inquirer/external-editor": "^1.0.3", - "@inquirer/type": "^3.0.10" + "@inquirer/core": "^11.2.1", + "@inquirer/external-editor": "^3.0.3", + "@inquirer/type": "^4.0.7" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3207,18 +2870,17 @@ } }, "node_modules/@inquirer/expand": { - "version": "4.0.23", - "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.23.tgz", - "integrity": "sha512-nRzdOyFYnpeYTTR2qFwEVmIWypzdAx/sIkCMeTNTcflFOovfqUk+HcFhQQVBftAh9gmGrpFj6QcGEqrDMDOiew==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-5.1.1.tgz", + "integrity": "sha512-YmQpenjbFSHAK3sOd44puHh3V1KXXr+JiNpUztoSQ4drLh2rTVzTap/YtlAVu/5xavifIlBfNEzJ/neZJ1a/1g==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.3.2", - "@inquirer/type": "^3.0.10", - "yoctocolors-cjs": "^2.1.3" + "@inquirer/core": "^11.2.1", + "@inquirer/type": "^4.0.7" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3230,17 +2892,17 @@ } }, "node_modules/@inquirer/external-editor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.3.tgz", - "integrity": "sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-3.0.3.tgz", + "integrity": "sha512-6thf5I8q7lZwzGLAxPaaGEREEkZ3nyePPDQ1oyobblxmEE8mqTLguScP7pDjUTAibiyb4hfXl+qjUEJ+di/aNA==", "dev": true, "license": "MIT", "dependencies": { "chardet": "^2.1.1", - "iconv-lite": "^0.7.0" + "iconv-lite": "^0.7.2" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3252,9 +2914,9 @@ } }, "node_modules/@inquirer/external-editor/node_modules/iconv-lite": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", - "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz", + "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3269,27 +2931,27 @@ } }, "node_modules/@inquirer/figures": { - "version": "1.0.15", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.15.tgz", - "integrity": "sha512-t2IEY+unGHOzAaVM5Xx6DEWKeXlDDcNPeDyUpsRc6CUhBfU3VQOEl+Vssh7VNp1dR8MdUJBWhuObjXCsVpjN5g==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-2.0.7.tgz", + "integrity": "sha512-aJ8TBPOGB6f/2qziPfElISTCEd5XOYTFckA2SGjhNmiKzfK/u4ot3v0DUzGVdUnKjN10EqnnEPck36BkyfLnJw==", "dev": true, "license": "MIT", "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" } }, "node_modules/@inquirer/input": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.3.1.tgz", - "integrity": "sha512-kN0pAM4yPrLjJ1XJBjDxyfDduXOuQHrBB8aLDMueuwUGn+vNpF7Gq7TvyVxx8u4SHlFFj4trmj+a2cbpG4Jn1g==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-5.1.2.tgz", + "integrity": "sha512-9K/DDBSQpOyZSkt6sOVP9Vo0TR7atX2kuILsUu0x3wVcVbe97lJwIJKMLdMw25tDYuXl/qp6erT0Xs1rfmcfZg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.3.2", - "@inquirer/type": "^3.0.10" + "@inquirer/core": "^11.2.1", + "@inquirer/type": "^4.0.7" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3301,17 +2963,17 @@ } }, "node_modules/@inquirer/number": { - "version": "3.0.23", - "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.23.tgz", - "integrity": "sha512-5Smv0OK7K0KUzUfYUXDXQc9jrf8OHo4ktlEayFlelCjwMXz0299Y8OrI+lj7i4gCBY15UObk76q0QtxjzFcFcg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-4.1.1.tgz", + "integrity": "sha512-XF4IXAbPnGPgw0wsbC/i2tPcyfdZgDpUlhsqU0SfT4IRIGWha6Xm9VRgN5yYxJq+jnyXlfXI/nQ3ulfk0iEICA==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.3.2", - "@inquirer/type": "^3.0.10" + "@inquirer/core": "^11.2.1", + "@inquirer/type": "^4.0.7" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3323,18 +2985,18 @@ } }, "node_modules/@inquirer/password": { - "version": "4.0.23", - "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.23.tgz", - "integrity": "sha512-zREJHjhT5vJBMZX/IUbyI9zVtVfOLiTO66MrF/3GFZYZ7T4YILW5MSkEYHceSii/KtRk+4i3RE7E1CUXA2jHcA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-5.1.1.tgz", + "integrity": "sha512-3XBfF7DAsp5qeDsvN5Rd1HmbNokVvEQoUM0QLrRcybC9nX96w3Pbmu7qUsb3IT3J3jBvs2+mTXaKHOUsgHMLzg==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^1.0.2", - "@inquirer/core": "^10.3.2", - "@inquirer/type": "^3.0.10" + "@inquirer/ansi": "^2.0.7", + "@inquirer/core": "^11.2.1", + "@inquirer/type": "^4.0.7" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3346,25 +3008,25 @@ } }, "node_modules/@inquirer/prompts": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.10.1.tgz", - "integrity": "sha512-Dx/y9bCQcXLI5ooQ5KyvA4FTgeo2jYj/7plWfV5Ak5wDPKQZgudKez2ixyfz7tKXzcJciTxqLeK7R9HItwiByg==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-8.4.2.tgz", + "integrity": "sha512-XJmn/wY4AX56l1BRU+ZjDrFtg9+2uBEi4JvJQj82kwJDQKiPgSn4CEsbfGGygS4Gw6rkL4W18oATjfVfaqub2Q==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/checkbox": "^4.3.2", - "@inquirer/confirm": "^5.1.21", - "@inquirer/editor": "^4.2.23", - "@inquirer/expand": "^4.0.23", - "@inquirer/input": "^4.3.1", - "@inquirer/number": "^3.0.23", - "@inquirer/password": "^4.0.23", - "@inquirer/rawlist": "^4.1.11", - "@inquirer/search": "^3.2.2", - "@inquirer/select": "^4.4.2" + "@inquirer/checkbox": "^5.1.4", + "@inquirer/confirm": "^6.0.12", + "@inquirer/editor": "^5.1.1", + "@inquirer/expand": "^5.0.13", + "@inquirer/input": "^5.0.12", + "@inquirer/number": "^4.0.12", + "@inquirer/password": "^5.0.12", + "@inquirer/rawlist": "^5.2.8", + "@inquirer/search": "^4.1.8", + "@inquirer/select": "^5.1.4" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3376,18 +3038,17 @@ } }, "node_modules/@inquirer/rawlist": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.1.11.tgz", - "integrity": "sha512-+LLQB8XGr3I5LZN/GuAHo+GpDJegQwuPARLChlMICNdwW7OwV2izlCSCxN6cqpL0sMXmbKbFcItJgdQq5EBXTw==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-5.3.1.tgz", + "integrity": "sha512-QqdTqQddL3qPX/PPrjobpsO25NZ4dWXgTLenrR445L2ptLEYE6Z+PD5c5CNDJNx4ugRgELAIpSIJxZaO2jJ2Og==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.3.2", - "@inquirer/type": "^3.0.10", - "yoctocolors-cjs": "^2.1.3" + "@inquirer/core": "^11.2.1", + "@inquirer/type": "^4.0.7" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3399,19 +3060,18 @@ } }, "node_modules/@inquirer/search": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.2.2.tgz", - "integrity": "sha512-p2bvRfENXCZdWF/U2BXvnSI9h+tuA8iNqtUKb9UWbmLYCRQxd8WkvwWvYn+3NgYaNwdUkHytJMGG4MMLucI1kA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-4.2.1.tgz", + "integrity": "sha512-xJj8QWKRSrfKoBIITLZK61dD3zwo0Rz11fgDImku30/Oe81zMdIdGgrLY2h6RkJ+KZ/GhNYIRMKnH/62qBTA5g==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/core": "^10.3.2", - "@inquirer/figures": "^1.0.15", - "@inquirer/type": "^3.0.10", - "yoctocolors-cjs": "^2.1.3" + "@inquirer/core": "^11.2.1", + "@inquirer/figures": "^2.0.7", + "@inquirer/type": "^4.0.7" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3423,20 +3083,19 @@ } }, "node_modules/@inquirer/select": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.4.2.tgz", - "integrity": "sha512-l4xMuJo55MAe+N7Qr4rX90vypFwCajSakx59qe/tMaC1aEHWLyw68wF4o0A4SLAY4E0nd+Vt+EyskeDIqu1M6w==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-5.2.1.tgz", + "integrity": "sha512-FlDndEUww8m7BfukO2nJa25vhD+H5jxxCv4oGioKqzyWz3nPHhhw4LKdYRSlXuAx7DsdWia7iyaBPKKS95Evfw==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/ansi": "^1.0.2", - "@inquirer/core": "^10.3.2", - "@inquirer/figures": "^1.0.15", - "@inquirer/type": "^3.0.10", - "yoctocolors-cjs": "^2.1.3" + "@inquirer/ansi": "^2.0.7", + "@inquirer/core": "^11.2.1", + "@inquirer/figures": "^2.0.7", + "@inquirer/type": "^4.0.7" }, "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3448,13 +3107,13 @@ } }, "node_modules/@inquirer/type": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.10.tgz", - "integrity": "sha512-BvziSRxfz5Ov8ch0z/n3oijRSEcEsHnhggm4xFZe93DHcUCTlutlq9Ox4SVENAfcRD22UQq7T/atg9Wr3k09eA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-4.0.7.tgz", + "integrity": "sha512-t28inv14nMQ1PhKpsJPY+kEs/c00qzeCOS2gTNRyTjG5d6qsVA2fItxW4hkvGZ5lvanGLdtCzVIx5dwdRpN1+g==", "dev": true, "license": "MIT", "engines": { - "node": ">=18" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -3555,26 +3214,26 @@ "license": "MIT" }, "node_modules/@listr2/prompt-adapter-inquirer": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-3.0.5.tgz", - "integrity": "sha512-WELs+hj6xcilkloBXYf9XXK8tYEnKsgLj01Xl5ONUJpKjmT5hGVUzNUS5tooUxs7pGMrw+jFD/41WpqW4V3LDA==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-4.2.3.tgz", + "integrity": "sha512-Co9U3AJ3LW0J8XBHjVoNKA79dMAyFt8EZH3OaKTMcDTj8r+6kG3vSUPq/eGLHT7P0iK3uLaFfhdFYd3033P24g==", "dev": true, "license": "MIT", "dependencies": { - "@inquirer/type": "^3.0.8" + "@inquirer/type": "^4.0.5" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.13.0" }, "peerDependencies": { - "@inquirer/prompts": ">= 3 < 8", - "listr2": "9.0.5" + "@inquirer/prompts": ">= 3 < 9", + "listr2": "10.2.1" } }, "node_modules/@lmdb/lmdb-darwin-arm64": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.5.1.tgz", - "integrity": "sha512-tpfN4kKrrMpQ+If1l8bhmoNkECJi0iOu6AEdrTJvWVC+32sLxTARX5Rsu579mPImRP9YFWfWgeRQ5oav7zApQQ==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.5.4.tgz", + "integrity": "sha512-Kk4Kz3iyu1QiLsLZBS9Af1eSKUC8VR2T+/jyE2iAyuGw2VwK08pp5iTbZnXn6sWu0LogO/RFktMxOjiDA2sS3w==", "cpu": [ "arm64" ], @@ -3586,9 +3245,9 @@ ] }, "node_modules/@lmdb/lmdb-darwin-x64": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.5.1.tgz", - "integrity": "sha512-+a2tTfc3rmWhLAolFUWRgJtpSuu+Fw/yjn4rF406NMxhfjbMuiOUTDRvRlMFV+DzyjkwnokisskHbCWkS3Ly5w==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.5.4.tgz", + "integrity": "sha512-BEe5Rp3trn26oxoXOVL5HVDoiYmjUDwr8NRPkBOdUdCSBEorKI+7JrZLRKAdxO+G6cGQLgseXk0gR7qIQa7aGw==", "cpu": [ "x64" ], @@ -3600,9 +3259,9 @@ ] }, "node_modules/@lmdb/lmdb-linux-arm": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.5.1.tgz", - "integrity": "sha512-0EgcE6reYr8InjD7V37EgXcYrloqpxVPINy3ig1MwDSbl6LF/vXTYRH9OE1Ti1D8YZnB35ZH9aTcdfSb5lql2A==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.5.4.tgz", + "integrity": "sha512-SGbFR7816uBcTHc2ZY4S6WyOkl9bICnzqTQd2Mv4V/j24cfds88xx2nC6cm/y8zGQL7Ds31YF/5NGxjgcdM5Hw==", "cpu": [ "arm" ], @@ -3614,9 +3273,9 @@ ] }, "node_modules/@lmdb/lmdb-linux-arm64": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.5.1.tgz", - "integrity": "sha512-aoERa5B6ywXdyFeYGQ1gbQpkMkDbEo45qVoXE5QpIRavqjnyPwjOulMkmkypkmsbJ5z4Wi0TBztON8agCTG0Vg==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.5.4.tgz", + "integrity": "sha512-cUXEengO8o60v1SWerJTH4/RH4U3+9jC0/4njp2Z9NdmvaGzhKsbRM2wpXuRYrN8tytsoJCg0SvWEWwHAwLbCA==", "cpu": [ "arm64" ], @@ -3628,9 +3287,9 @@ ] }, "node_modules/@lmdb/lmdb-linux-x64": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.5.1.tgz", - "integrity": "sha512-SqNDY1+vpji7bh0sFH5wlWyFTOzjbDOl0/kB5RLLYDAFyd/uw3n7wyrmas3rYPpAW7z18lMOi1yKlTPv967E3g==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.5.4.tgz", + "integrity": "sha512-Gxq8jpgOWXwd0PUR+c9R2Ik1/uBnGd5GMIIzRRDqABCkvmjtC3KWcyhesV9jSPCz759isl0NlbsstZ2oyvk8lA==", "cpu": [ "x64" ], @@ -3642,9 +3301,9 @@ ] }, "node_modules/@lmdb/lmdb-win32-arm64": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-arm64/-/lmdb-win32-arm64-3.5.1.tgz", - "integrity": "sha512-50v0O1Lt37cwrmR9vWZK5hRW0Aw+KEmxJJ75fge/zIYdvNKB/0bSMSVR5Uc2OV9JhosIUyklOmrEvavwNJ8D6w==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-arm64/-/lmdb-win32-arm64-3.5.4.tgz", + "integrity": "sha512-pKv1DJ1bPZAaHkdFsSz5IDfUG8x9vntgquXF9/Dm2xuupcIe/EkLzylpoBxppFVK5vzbV561Dq26jNY2fIMA7g==", "cpu": [ "arm64" ], @@ -3656,9 +3315,9 @@ ] }, "node_modules/@lmdb/lmdb-win32-x64": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.5.1.tgz", - "integrity": "sha512-qwosvPyl+zpUlp3gRb7UcJ3H8S28XHCzkv0Y0EgQToXjQP91ZD67EHSCDmaLjtKhe+GVIW5om1KUpzVLA0l6pg==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.5.4.tgz", + "integrity": "sha512-JF1BmLCm9kGEVZgYmJq43zeQVdHVgAJnTi/NURWEsy6L1ZrrlSmdltS+D17QN4LODwf+1LMXAA9auIZVXtWwzw==", "cpu": [ "x64" ], @@ -3700,9 +3359,9 @@ } }, "node_modules/@modelcontextprotocol/sdk": { - "version": "1.26.0", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.26.0.tgz", - "integrity": "sha512-Y5RmPncpiDtTXDbLKswIJzTqu2hyBKxTNsgKqKclDbhIgg1wgtf1fRuvxgTnRfcnxtvvgbIEcqUOzZrJ6iSReg==", + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz", + "integrity": "sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3741,9 +3400,9 @@ } }, "node_modules/@modelcontextprotocol/sdk/node_modules/iconv-lite": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", - "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz", + "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3774,9 +3433,9 @@ } }, "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz", - "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.4.tgz", + "integrity": "sha512-LCkGo6JDfaBhgST7UpPWgNgLINpcpabaHfyz5OBx75nUYxBsaEPxjnyNjWpeb/xBup/682QnBfRBy2/LvPutZQ==", "cpu": [ "arm64" ], @@ -3788,9 +3447,9 @@ ] }, "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz", - "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.4.tgz", + "integrity": "sha512-zExlW9zUJKZH/tOtVMttwjKa4Xm/3KcNjnE3dPN92uCktwavMxpgCA3MoJK/DOnTWsQgo224OaST27/mPNAf+w==", "cpu": [ "x64" ], @@ -3802,9 +3461,9 @@ ] }, "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz", - "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.4.tgz", + "integrity": "sha512-Tg3yX65f5GbtXLkrYEHE5oibZG9epyYWas7FogTTEJeDEF9JlXJzKgXaNhT3UXlTOeA+AfZpYZYZ0uPj7Cfquw==", "cpu": [ "arm" ], @@ -3816,9 +3475,9 @@ ] }, "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz", - "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.4.tgz", + "integrity": "sha512-dgX0P/9wGPJeHFBG+ZmhgE6bmtMt7NP5CRBGyyktpopdk/mW4POnrpQsSLtKI1dwpc+pPLuXHDh6vvskyQE/sw==", "cpu": [ "arm64" ], @@ -3830,9 +3489,9 @@ ] }, "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz", - "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.4.tgz", + "integrity": "sha512-8TNXMEjJc3QEy7R/x1INhgiU+XakDAFUzBhaz7+Rbrs8NH5UQeHQxxmzsSBJGyV6I1jW79undiQm8tOI+D+8FQ==", "cpu": [ "x64" ], @@ -3844,9 +3503,9 @@ ] }, "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz", - "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.4.tgz", + "integrity": "sha512-CmCXPQrkbwExx3j946/PtHWHbYJiCRBRDl4BlkRQcJB/YOwQxJRTpoo7aTsortjgoJ1x7opzTSxn7C+ASSLVjQ==", "cpu": [ "x64" ], @@ -4180,27 +3839,10 @@ "node": ">= 10" } }, - "node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.1.tgz", - "integrity": "sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/core": "^1.7.1", - "@emnapi/runtime": "^1.7.1", - "@tybys/wasm-util": "^0.10.1" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/Brooooooklyn" - } - }, "node_modules/@ngx-pwa/local-storage": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/@ngx-pwa/local-storage/-/local-storage-21.0.0.tgz", - "integrity": "sha512-MOsgo5G2HvWHOzWus868K/CLHtHmaOPvIkOharYKic6ze/+w8vz6J7KEcIcZ6zmGniEvdefNRWO+XIaah+av3w==", + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/@ngx-pwa/local-storage/-/local-storage-22.0.0.tgz", + "integrity": "sha512-k5ZamLx8YTjAkvS6x+RHYBBGbcXrR0EnvI6Xgxaf29yKcwXXA61iQ8VRpFXeLY+0B/qT/Su2auXlJ8RLaIrG9g==", "license": "MIT", "dependencies": { "tslib": "^2.5.0" @@ -4210,8 +3852,8 @@ "url": "https://github.com/sponsors/cyrilletuzi" }, "peerDependencies": { - "@angular/common": "^21.0.0", - "@angular/core": "^21.0.0", + "@angular/common": "^22.0.0", + "@angular/core": "^22.0.0", "rxjs": "^7.6.0" } }, @@ -4477,16 +4119,6 @@ "resolved": "../packages/openslides-motion-diff", "link": true }, - "node_modules/@oxc-project/types": { - "version": "0.113.0", - "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.113.0.tgz", - "integrity": "sha512-Tp3XmgxwNQ9pEN9vxgJBAqdRamHibi76iowQ38O2I4PMpcvNRQNVsU2n1x1nv9yh0XoTrGFzf7cZSGxmixxrhA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/Boshen" - } - }, "node_modules/@parcel/watcher": { "version": "2.5.6", "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz", @@ -4616,6 +4248,9 @@ "arm" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -4637,6 +4272,9 @@ "arm" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -4658,6 +4296,9 @@ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -4679,6 +4320,9 @@ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -4700,6 +4344,9 @@ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -4721,6 +4368,9 @@ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -4760,247 +4410,26 @@ "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz", "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==", "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-win32-x64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz", - "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher/node_modules/node-addon-api": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", - "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", - "dev": true, - "license": "MIT", - "optional": true - }, - "node_modules/@pdf-lib/standard-fonts": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@pdf-lib/standard-fonts/-/standard-fonts-1.0.0.tgz", - "integrity": "sha512-hU30BK9IUN/su0Mn9VdlVKsWBS6GyhVfqjwl1FjZN4TxP6cCw0jP2w7V3Hf5uX7M0AZJ16vey9yE0ny7Sa59ZA==", - "license": "MIT", - "dependencies": { - "pako": "^1.0.6" - } - }, - "node_modules/@pdf-lib/upng": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@pdf-lib/upng/-/upng-1.0.1.tgz", - "integrity": "sha512-dQK2FUMQtowVP00mtIksrlZhdFXQZPC+taih1q4CvPZ5vqdxR/LKBaFg0oAfzd1GlHZXXSPdQfzQnt+ViGvEIQ==", - "license": "MIT", - "dependencies": { - "pako": "^1.0.10" - } - }, - "node_modules/@phenomnomnominal/tsquery": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/@phenomnomnominal/tsquery/-/tsquery-6.1.4.tgz", - "integrity": "sha512-3tHlGy/fxjJCHqIV8nelAzbRTNkCUY+k7lqBGKNuQz99H2OKGRt6oU+U2SZs6LYrbOe8mxMFl6kq6gzHapFRkw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/esquery": "^1.5.0", - "esquery": "^1.5.0" - }, - "peerDependencies": { - "typescript": "^3 || ^4 || ^5" - } - }, - "node_modules/@pkgr/core": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.3.6.tgz", - "integrity": "sha512-SEeaJLb3qBNF/OaXnaR1NmmBbFYk1zC0ZH/52fATcRPLFg/p791YrcyFFy44Bo9sLaGuSuLp5Q6axbb/O+v/RA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/pkgr" - } - }, - "node_modules/@popperjs/core": { - "version": "2.11.8", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", - "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", - "license": "MIT", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, - "node_modules/@rolldown/binding-android-arm64": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.0-rc.4.tgz", - "integrity": "sha512-vRq9f4NzvbdZavhQbjkJBx7rRebDKYR9zHfO/Wg486+I7bSecdUapzCm5cyXoK+LHokTxgSq7A5baAXUZkIz0w==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } - }, - "node_modules/@rolldown/binding-darwin-arm64": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.0-rc.4.tgz", - "integrity": "sha512-kFgEvkWLqt3YCgKB5re9RlIrx9bRsvyVUnaTakEpOPuLGzLpLapYxE9BufJNvPg8GjT6mB1alN4yN1NjzoeM8Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } - }, - "node_modules/@rolldown/binding-darwin-x64": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.0-rc.4.tgz", - "integrity": "sha512-JXmaOJGsL/+rsmMfutcDjxWM2fTaVgCHGoXS7nE8Z3c9NAYjGqHvXrAhMUZvMpHS/k7Mg+X7n/MVKb7NYWKKww==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } - }, - "node_modules/@rolldown/binding-freebsd-x64": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.0-rc.4.tgz", - "integrity": "sha512-ep3Catd6sPnHTM0P4hNEvIv5arnDvk01PfyJIJ+J3wVCG1eEaPo09tvFqdtcaTrkwQy0VWR24uz+cb4IsK53Qw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } - }, - "node_modules/@rolldown/binding-linux-arm-gnueabihf": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.0-rc.4.tgz", - "integrity": "sha512-LwA5ayKIpnsgXJEwWc3h8wPiS33NMIHd9BhsV92T8VetVAbGe2qXlJwNVDGHN5cOQ22R9uYvbrQir2AB+ntT2w==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } - }, - "node_modules/@rolldown/binding-linux-arm64-gnu": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.0-rc.4.tgz", - "integrity": "sha512-AC1WsGdlV1MtGay/OQ4J9T7GRadVnpYRzTcygV1hKnypbYN20Yh4t6O1Sa2qRBMqv1etulUknqXjc3CTIsBu6A==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } - }, - "node_modules/@rolldown/binding-linux-arm64-musl": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.0-rc.4.tgz", - "integrity": "sha512-lU+6rgXXViO61B4EudxtVMXSOfiZONR29Sys5VGSetUY7X8mg9FCKIIjcPPj8xNDeYzKl+H8F/qSKOBVFJChCQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" - } - }, - "node_modules/@rolldown/binding-linux-x64-gnu": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.0-rc.4.tgz", - "integrity": "sha512-DZaN1f0PGp/bSvKhtw50pPsnln4T13ycDq1FrDWRiHmWt1JeW+UtYg9touPFf8yt993p8tS2QjybpzKNTxYEwg==", - "cpu": [ - "x64" + "ia32" ], "dev": true, "license": "MIT", "optional": true, "os": [ - "linux" + "win32" ], "engines": { - "node": "^20.19.0 || >=22.12.0" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@rolldown/binding-linux-x64-musl": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.0-rc.4.tgz", - "integrity": "sha512-RnGxwZLN7fhMMAItnD6dZ7lvy+TI7ba+2V54UF4dhaWa/p8I/ys1E73KO6HmPmgz92ZkfD8TXS1IMV8+uhbR9g==", + "node_modules/@parcel/watcher-win32-x64": { + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz", + "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==", "cpu": [ "x64" ], @@ -5008,91 +4437,84 @@ "license": "MIT", "optional": true, "os": [ - "linux" + "win32" ], "engines": { - "node": "^20.19.0 || >=22.12.0" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@rolldown/binding-openharmony-arm64": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.0-rc.4.tgz", - "integrity": "sha512-6lcI79+X8klGiGd8yHuTgQRjuuJYNggmEml+RsyN596P23l/zf9FVmJ7K0KVKkFAeYEdg0iMUKyIxiV5vebDNQ==", - "cpu": [ - "arm64" - ], + "node_modules/@parcel/watcher/node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" + "optional": true + }, + "node_modules/@pdf-lib/standard-fonts": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@pdf-lib/standard-fonts/-/standard-fonts-1.0.0.tgz", + "integrity": "sha512-hU30BK9IUN/su0Mn9VdlVKsWBS6GyhVfqjwl1FjZN4TxP6cCw0jP2w7V3Hf5uX7M0AZJ16vey9yE0ny7Sa59ZA==", + "license": "MIT", + "dependencies": { + "pako": "^1.0.6" } }, - "node_modules/@rolldown/binding-wasm32-wasi": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.0-rc.4.tgz", - "integrity": "sha512-wz7ohsKCAIWy91blZ/1FlpPdqrsm1xpcEOQVveWoL6+aSPKL4VUcoYmmzuLTssyZxRpEwzuIxL/GDsvpjaBtOw==", - "cpu": [ - "wasm32" - ], - "dev": true, + "node_modules/@pdf-lib/upng": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@pdf-lib/upng/-/upng-1.0.1.tgz", + "integrity": "sha512-dQK2FUMQtowVP00mtIksrlZhdFXQZPC+taih1q4CvPZ5vqdxR/LKBaFg0oAfzd1GlHZXXSPdQfzQnt+ViGvEIQ==", "license": "MIT", - "optional": true, "dependencies": { - "@napi-rs/wasm-runtime": "^1.1.1" - }, - "engines": { - "node": ">=14.0.0" + "pako": "^1.0.10" } }, - "node_modules/@rolldown/binding-win32-arm64-msvc": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.0-rc.4.tgz", - "integrity": "sha512-cfiMrfuWCIgsFmcVG0IPuO6qTRHvF7NuG3wngX1RZzc6dU8FuBFb+J3MIR5WrdTNozlumfgL4cvz+R4ozBCvsQ==", - "cpu": [ - "arm64" - ], + "node_modules/@phenomnomnominal/tsquery": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@phenomnomnominal/tsquery/-/tsquery-6.2.0.tgz", + "integrity": "sha512-Vo9nkhfZxDB/sBiqIY3pjDC4mOSyure+AFlEW5hcy/tRE82MqCXjRN4InnVNMldinRt0dLYqg4HAU2XPq5e1LA==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": "^20.19.0 || >=22.12.0" + "dependencies": { + "@types/esquery": "^1.5.4", + "esquery": "^1.7.0" + }, + "peerDependencies": { + "typescript": ">3.0.0" } }, - "node_modules/@rolldown/binding-win32-x64-msvc": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.0-rc.4.tgz", - "integrity": "sha512-p6UeR9y7ht82AH57qwGuFYn69S6CZ7LLKdCKy/8T3zS9VTrJei2/CGsTUV45Da4Z9Rbhc7G4gyWQ/Ioamqn09g==", - "cpu": [ - "x64" - ], + "node_modules/@pkgr/core": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.3.6.tgz", + "integrity": "sha512-SEeaJLb3qBNF/OaXnaR1NmmBbFYk1zC0ZH/52fATcRPLFg/p791YrcyFFy44Bo9sLaGuSuLp5Q6axbb/O+v/RA==", "dev": true, "license": "MIT", - "optional": true, - "os": [ - "win32" - ], "engines": { - "node": "^20.19.0 || >=22.12.0" + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/pkgr" } }, - "node_modules/@rolldown/pluginutils": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.4.tgz", - "integrity": "sha512-1BrrmTu0TWfOP1riA8uakjFc9bpIUGzVKETsOtzY39pPga8zELGDl8eu1Dx7/gjM5CAz14UknsUMpBO8L+YntQ==", - "dev": true, - "license": "MIT" + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "license": "MIT", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz", - "integrity": "sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.2.tgz", + "integrity": "sha512-dnlp69efPPg6Uaw2dVqzWRfAWRnYVb1XJ8CyyhIbZeaq4CA5/mLeZ1IEt9QqQxmbdvagjLIm2ZL8BxXv5lH4Yw==", "cpu": [ "arm" ], @@ -5104,9 +4526,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.59.0.tgz", - "integrity": "sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.2.tgz", + "integrity": "sha512-OqZTwDRDchGRHHm/hwLOL7uVPB9aUvI0am/eQuWMNyFHf5PSEQmyEeYYheA0EPPKUO/l0uigCp+iaTjoLjVoHg==", "cpu": [ "arm64" ], @@ -5118,9 +4540,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.59.0.tgz", - "integrity": "sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.2.tgz", + "integrity": "sha512-UwRE7CGpvSVEQS8gUMBe1uADWjNnVgP3Iusyda1nSRwNDCsRjnGc7w6El6WLQsXmZTbLZx9cecegumcitNfpmA==", "cpu": [ "arm64" ], @@ -5132,9 +4554,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.59.0.tgz", - "integrity": "sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.2.tgz", + "integrity": "sha512-gjEtURKLCC5VXm1I+2i1u9OhxFsKAQJKTVB8WvDAHF+oZlq0GTVFOlTlO1q3AlCTE/DF32c16ESvfgqR7343/g==", "cpu": [ "x64" ], @@ -5146,9 +4568,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.59.0.tgz", - "integrity": "sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.2.tgz", + "integrity": "sha512-Bcl6CYDeAgE70cqZaMojOi/eK63h5Me97ZqAQoh77VPjMysA/4ORQBRGo3rRy45x4MzVlU9uZxs8Uwy7ZaKnBw==", "cpu": [ "arm64" ], @@ -5160,9 +4582,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.59.0.tgz", - "integrity": "sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.2.tgz", + "integrity": "sha512-LU+TPda3mAE2QB0/Hp5VyeKJivpC6+tlOXd1VMoXV/YFMvk/MNk5iXeBfB4MQGRWyOYVJ01625vjkr0Az98OJQ==", "cpu": [ "x64" ], @@ -5174,13 +4596,16 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.59.0.tgz", - "integrity": "sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.2.tgz", + "integrity": "sha512-2QxQrM+KQ7DAW4o22j+XZ6RKdxjLD7BOWTP0Bv0tmjdyhXSsr2Ul1oJDQqh9Zf5qOwTuTc7Ek83mOFaKnodPjg==", "cpu": [ "arm" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5188,13 +4613,16 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.59.0.tgz", - "integrity": "sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.2.tgz", + "integrity": "sha512-TbziEu2DVsTEOPif2mKWkMeDMLoYjx95oESa9fkQQK7r/Orta0gnkcDpzwufEcAO2BLBsD7mZkXGFqEdMRRwfw==", "cpu": [ "arm" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5202,13 +4630,16 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.59.0.tgz", - "integrity": "sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.2.tgz", + "integrity": "sha512-bO/rVDiDUuM2YfuCUwZ1t1cP+/yqjqz+Xf2VtkdppefuOFS2OSeAfgafaHNkFn0t02hEyXngZkxtGqXcXwO8Rg==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5216,13 +4647,16 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.59.0.tgz", - "integrity": "sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.2.tgz", + "integrity": "sha512-hr26p7e93Rl0Za+JwW7EAnwAvKkehh12BU1Llm9Ykiibg4uIr2rbpxG9WCf56GuvidlTG9KiiQT/TXT1yAWxTA==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5230,13 +4664,16 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.59.0.tgz", - "integrity": "sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.2.tgz", + "integrity": "sha512-pOjB/uSIyDt+ow3k/RcLvUAOGpysT2phDn7TTUB3n75SlIgZzM6NKAqlErPhoFU+npgY3/n+2HYIQVbF70P9/A==", "cpu": [ "loong64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5244,13 +4681,16 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.59.0.tgz", - "integrity": "sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.2.tgz", + "integrity": "sha512-2/w+q8jszv9Ww1c+6uJT3OwqhdmGP2/4T17cu8WuwyUuuaCDDJ2ojdyYwZzCxx0GcsZBhzi3HmH+J5pZNXnd+Q==", "cpu": [ "loong64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5258,13 +4698,16 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.59.0.tgz", - "integrity": "sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.2.tgz", + "integrity": "sha512-11+aL5vKheYgczxtPVVRhdptAM2H7fcDR5Gw4/bTcteuZBlH4oP9f5s9zYO9aGZvoGeBpqXI/9TZZihZ609wKw==", "cpu": [ "ppc64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5272,13 +4715,16 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.59.0.tgz", - "integrity": "sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.2.tgz", + "integrity": "sha512-i16fokAGK46IVZuV8LIIwMdtqhin9hfYkCh8pf8iC3QU3LpwL+1FSFGej+O7l3E/AoknL6Dclh2oTdnRMpTzFQ==", "cpu": [ "ppc64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5286,13 +4732,16 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.59.0.tgz", - "integrity": "sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.2.tgz", + "integrity": "sha512-49FkKS6RGQoriDSK/6E2GkAsAuU5kETFCh7pG4yD/ylj9rKhTmO3elsnmBvRD4PgJPds5W2PkhC82aVwmUcJ7A==", "cpu": [ "riscv64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5300,13 +4749,16 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.59.0.tgz", - "integrity": "sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.2.tgz", + "integrity": "sha512-mjYNkHPfGpUR00DuM1ZZIgs64Hpf4bWcz9Z41+4Q+pgDx73UwWdAYyf6EG/lRFldmdHHzgrYyge5akFUW0D3mQ==", "cpu": [ "riscv64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5314,13 +4766,16 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.59.0.tgz", - "integrity": "sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.2.tgz", + "integrity": "sha512-ALyvJz965BQk8E9Al/JDKKDLH2kfKFLTGMlgkAbbYtZuJt9LU8DW3ZoDMCtQpXAltZxwBHevXz5u+gf0yA0YoA==", "cpu": [ "s390x" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5328,13 +4783,16 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz", - "integrity": "sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.2.tgz", + "integrity": "sha512-UQjrkIdWrKI626Du8lCQ6MJp/6V1LAo2bOK9OTu4mSn8GGXIkPXk/Vsp4bLHCd9Z9Iz2OTEaokUE90VweJgIYQ==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -5342,13 +4800,16 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.59.0.tgz", - "integrity": "sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.2.tgz", + "integrity": "sha512-bTsRGj6VlSdn/XD4CGyzMnzaBs9bsRxy79eTqTCBsA8TMIEky7qg48aPkvJvFe1HyzQ5oMZdg7AnVlWQSKLTnw==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5356,9 +4817,9 @@ ] }, "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.59.0.tgz", - "integrity": "sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.2.tgz", + "integrity": "sha512-6d4Z3534xitaA1FcMWP7mQPq5zGwBmGbhphh2DwaA1aNIXUu3KTOfwrWpbwI4/Gr0uANo7NTtaykFyO2hPuFLg==", "cpu": [ "x64" ], @@ -5370,9 +4831,9 @@ ] }, "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.59.0.tgz", - "integrity": "sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.2.tgz", + "integrity": "sha512-NetAg5iO2uN7eB8zE5qrZ3CSil+7IJt4WDFLcC75Ymywq1VZVD6qJ6EvNLjZ3rEm6gB7XW5JdT60c6MN35Z85Q==", "cpu": [ "arm64" ], @@ -5384,9 +4845,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.59.0.tgz", - "integrity": "sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.2.tgz", + "integrity": "sha512-NCYhOotpgWZ5kdxCZsv6Iudx0wX8980Q/oW4pNFNihpBKsDbEA1zpkfxJGC0yugsUuyDZ7gL37dbzwhR0VI7pQ==", "cpu": [ "arm64" ], @@ -5398,9 +4859,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.59.0.tgz", - "integrity": "sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.2.tgz", + "integrity": "sha512-RXsaOqXxfoUBQoOgvmmijVxJnW2IGB0eoMO7F8FAjaj0UTywUO/luSqimWBJn04WNgUkeNhh7fs7pESXajWmkg==", "cpu": [ "ia32" ], @@ -5412,9 +4873,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.59.0.tgz", - "integrity": "sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.2.tgz", + "integrity": "sha512-qdAzEULD+/hzObedtmV6iBpdL5TIbKVztGiK7O3/KYSf+HIzU257+MX1EXJcyIiDbMAqmbwaufcYPvyRryeZtA==", "cpu": [ "x64" ], @@ -5426,9 +4887,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.59.0.tgz", - "integrity": "sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.2.tgz", + "integrity": "sha512-Nd/SgG27WoA9e+/TdK74KnHz852TLa94ovOYySo/yMPuTmpckK/jIF2jSwS3g7ELSKXK13/cVdmg1Z/DaCWKxA==", "cpu": [ "x64" ], @@ -5440,82 +4901,21 @@ ] }, "node_modules/@schematics/angular": { - "version": "21.2.18", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-21.2.18.tgz", - "integrity": "sha512-XNEWvJSUg/ljLXgGVs7picBOtzVC4abBf2+i/ds9E7GaYYVyH19Mpgk6BOuMHAgRpjPWBAeWiBkTqetiR2Ps5Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@angular-devkit/core": "21.2.18", - "@angular-devkit/schematics": "21.2.18", - "jsonc-parser": "3.3.1" - }, - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - } - }, - "node_modules/@schematics/angular/node_modules/@angular-devkit/core": { - "version": "21.2.18", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.18.tgz", - "integrity": "sha512-783AuDmzAjFkOBHey7cx1mXd8CTiMg9LvG+BCxEp8i4EB7cOGYrq3lBzkwhKJq6yYpz7dNgM1QgeLk+NcrFBSA==", + "version": "22.0.6", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-22.0.6.tgz", + "integrity": "sha512-pZP52HlQaILmFKK4/iA2OyQ7mMP2V/K6z3gxbykWgXk/MNJ605PWaptHZOuvAAp+0qsFWJbj0MLmDdR3yMhdMQ==", "dev": true, "license": "MIT", "dependencies": { - "ajv": "8.18.0", - "ajv-formats": "3.0.1", + "@angular-devkit/core": "22.0.6", + "@angular-devkit/schematics": "22.0.6", "jsonc-parser": "3.3.1", - "picomatch": "4.0.4", - "rxjs": "7.8.2", - "source-map": "0.7.6" + "typescript": "6.0.3" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0", + "node": "^22.22.3 || ^24.15.0 || >=26.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "chokidar": "^5.0.0" - }, - "peerDependenciesMeta": { - "chokidar": { - "optional": true - } - } - }, - "node_modules/@schematics/angular/node_modules/chokidar": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", - "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "readdirp": "^5.0.0" - }, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@schematics/angular/node_modules/readdirp": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", - "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" } }, "node_modules/@sigstore/bundle": { @@ -6681,17 +6081,6 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/@tybys/wasm-util": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz", - "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@types/cors": { "version": "2.8.17", "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz", @@ -7050,17 +6439,17 @@ } }, "node_modules/@vendure/ngx-translate-extract": { - "version": "10.1.3", - "resolved": "https://registry.npmjs.org/@vendure/ngx-translate-extract/-/ngx-translate-extract-10.1.3.tgz", - "integrity": "sha512-HhtNWNc99UoOiWH5lda0gxAW0XTfASkRxQRwZ/bU9GiXMInTJxP38ouP4s/p04nivdZu5jJ/nimOxEN1TSulCw==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/@vendure/ngx-translate-extract/-/ngx-translate-extract-10.2.0.tgz", + "integrity": "sha512-dIRBTa4uA7wGjt/WzLIrOQBkQulrwSQU086U3c6W29MysQM/Oz0pWClqZNCyIzpF5wpDrbl9+MIQV7T11DtwQA==", "dev": true, "license": "MIT", "dependencies": { - "@phenomnomnominal/tsquery": "^6.1.4", + "@phenomnomnominal/tsquery": "^6.2.0", "braces": "^3.0.3", "flat": "^6.0.1", - "gettext-parser": "^9.0.0", - "glob": "^13.0.0", + "gettext-parser": "^9.0.2", + "glob": "^13.0.6", "yargs": "^18.0.0" }, "bin": { @@ -7124,16 +6513,16 @@ } }, "node_modules/@vitejs/plugin-basic-ssl": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-2.1.4.tgz", - "integrity": "sha512-HXciTXN/sDBYWgeAD4V4s0DN0g72x5mlxQhHxtYu3Tt8BLa6MzcJZUyDVFCdtjNs3bfENVHVzOsmooTVuNgAAw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-2.3.0.tgz", + "integrity": "sha512-bdyo8rB3NnQbikdMpHaML9Z1OZPBu6fFOBo+OtxsBlvMJtysWskmBcnbIDhUqgC8tcxNv/a+BcV5U+2nQMm1OQ==", "dev": true, "license": "MIT", "engines": { "node": "^18.0.0 || ^20.0.0 || >=22.0.0" }, "peerDependencies": { - "vite": "^6.0.0 || ^7.0.0" + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "node_modules/@xmldom/xmldom": { @@ -7245,9 +6634,9 @@ } }, "node_modules/ajv": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", - "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", + "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", "dev": true, "license": "MIT", "dependencies": { @@ -7280,117 +6669,55 @@ } }, "node_modules/algoliasearch": { - "version": "5.48.1", - "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.48.1.tgz", - "integrity": "sha512-Rf7xmeuIo7nb6S4mp4abW2faW8DauZyE2faBIKFaUfP3wnpOvNSbiI5AwVhqBNj0jPgBWEvhyCu0sLjN2q77Rg==", + "version": "5.52.0", + "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.52.0.tgz", + "integrity": "sha512-0ZzY9mjqV7gop/AH8pIBiAS8giXP7WcSiUfoFYIzYAK9QC5c37E4SIVtJVBMwlURc0/uNt2o4RcNRvdHa4CJ5w==", "dev": true, "license": "MIT", "dependencies": { - "@algolia/abtesting": "1.14.1", - "@algolia/client-abtesting": "5.48.1", - "@algolia/client-analytics": "5.48.1", - "@algolia/client-common": "5.48.1", - "@algolia/client-insights": "5.48.1", - "@algolia/client-personalization": "5.48.1", - "@algolia/client-query-suggestions": "5.48.1", - "@algolia/client-search": "5.48.1", - "@algolia/ingestion": "1.48.1", - "@algolia/monitoring": "1.48.1", - "@algolia/recommend": "5.48.1", - "@algolia/requester-browser-xhr": "5.48.1", - "@algolia/requester-fetch": "5.48.1", - "@algolia/requester-node-http": "5.48.1" + "@algolia/abtesting": "1.18.0", + "@algolia/client-abtesting": "5.52.0", + "@algolia/client-analytics": "5.52.0", + "@algolia/client-common": "5.52.0", + "@algolia/client-insights": "5.52.0", + "@algolia/client-personalization": "5.52.0", + "@algolia/client-query-suggestions": "5.52.0", + "@algolia/client-search": "5.52.0", + "@algolia/ingestion": "1.52.0", + "@algolia/monitoring": "1.52.0", + "@algolia/recommend": "5.52.0", + "@algolia/requester-browser-xhr": "5.52.0", + "@algolia/requester-fetch": "5.52.0", + "@algolia/requester-node-http": "5.52.0" }, "engines": { "node": ">= 14.0.0" } }, "node_modules/angular-eslint": { - "version": "21.4.0", - "resolved": "https://registry.npmjs.org/angular-eslint/-/angular-eslint-21.4.0.tgz", - "integrity": "sha512-LH7bWmtJvsubzwPoztnl1pWgI5X0VrfGTUITGSYcwn2J+SXuN/avzrKrxJmhUiIrNvLtfV+18GG6xZS1IGZdKg==", + "version": "22.1.0", + "resolved": "https://registry.npmjs.org/angular-eslint/-/angular-eslint-22.1.0.tgz", + "integrity": "sha512-LU5a6MOSeQTETnc4xaHi10p9S1cstNczr93sChi3rx8IzgH4+risIsjjQHVLSnQDrSGH2O8jAGCaChker7f7TQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": ">= 21.0.0 < 22.0.0", - "@angular-devkit/schematics": ">= 21.0.0 < 22.0.0", - "@angular-eslint/builder": "21.4.0", - "@angular-eslint/eslint-plugin": "21.4.0", - "@angular-eslint/eslint-plugin-template": "21.4.0", - "@angular-eslint/schematics": "21.4.0", - "@angular-eslint/template-parser": "21.4.0", + "@angular-devkit/core": ">= 22.0.0 < 23.0.0", + "@angular-devkit/schematics": ">= 22.0.0 < 23.0.0", + "@angular-eslint/builder": "22.1.0", + "@angular-eslint/eslint-plugin": "22.1.0", + "@angular-eslint/eslint-plugin-template": "22.1.0", + "@angular-eslint/schematics": "22.1.0", + "@angular-eslint/template-parser": "22.1.0", "@typescript-eslint/types": "^8.0.0", "@typescript-eslint/utils": "^8.0.0" }, "peerDependencies": { - "@angular/cli": ">= 21.0.0 < 22.0.0", - "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", + "@angular/cli": ">= 22.0.0 < 23.0.0", + "eslint": "^9.0.0 || ^10.0.0", "typescript": "*", "typescript-eslint": "^8.0.0" } }, - "node_modules/angular-eslint/node_modules/@angular-devkit/core": { - "version": "21.2.15", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-21.2.15.tgz", - "integrity": "sha512-x7EwuQtMGHANVznHpwyEi/3lMo/kRoaxV2w7lXbRGjTezwv4SPaOBwhrIGCbAVFs5B1ziff4jZzors4owlCTgg==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "8.18.0", - "ajv-formats": "3.0.1", - "jsonc-parser": "3.3.1", - "picomatch": "4.0.4", - "rxjs": "7.8.2", - "source-map": "0.7.6" - }, - "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0", - "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", - "yarn": ">= 1.13.0" - }, - "peerDependencies": { - "chokidar": "^5.0.0" - }, - "peerDependenciesMeta": { - "chokidar": { - "optional": true - } - } - }, - "node_modules/angular-eslint/node_modules/chokidar": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", - "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "readdirp": "^5.0.0" - }, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/angular-eslint/node_modules/readdirp": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", - "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", - "dev": true, - "license": "MIT", - "optional": true, - "peer": true, - "engines": { - "node": ">= 20.19.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - }, "node_modules/ansi-escapes": { "version": "7.3.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz", @@ -7664,9 +6991,9 @@ } }, "node_modules/beasties": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/beasties/-/beasties-0.4.1.tgz", - "integrity": "sha512-2Imdcw3LznDuxAbJM26RHniOLAzE6WgrK8OuvVXCQtNBS8rsnD9zsSEa3fHl4hHpUY7BYTlrpvtPVbvu9G6neg==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/beasties/-/beasties-0.4.2.tgz", + "integrity": "sha512-NvcGjG/7AVUAfRbvrJmHunDQS9uHnE6Q/7AkaPr8oKE8HjOlpjRG5075z/th2Tmlezk3VlaaS8+X9I1RwHJMQw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -8059,9 +7386,9 @@ } }, "node_modules/chardet": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.1.1.tgz", - "integrity": "sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.2.0.tgz", + "integrity": "sha512-rddelWYNPRrXq6PtNEN2S3f6t9ILzvqaN5pVgi4kqt9jHQaXIial9PznB5iSPVlQSLNaaH22ItWz3EJtQ10+OA==", "dev": true, "license": "MIT" }, @@ -8084,16 +7411,16 @@ "license": "BSD-2-Clause" }, "node_modules/chokidar": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", - "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", "dev": true, "license": "MIT", "dependencies": { - "readdirp": "^4.0.1" + "readdirp": "^5.0.0" }, "engines": { - "node": ">= 14.16.0" + "node": ">= 20.19.0" }, "funding": { "url": "https://paulmillr.com/funding/" @@ -8126,44 +7453,27 @@ } }, "node_modules/cli-spinners": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-3.4.0.tgz", - "integrity": "sha512-bXfOC4QcT1tKXGorxL3wbJm6XJPDqEnij2gQ2m7ESQuE+/z9YFIWnl/5RpTiKWbMq3EVKR4fRLJGn6DVfu0mpw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cli-truncate": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.1.1.tgz", - "integrity": "sha512-SroPvNHxUnk+vIW/dOSfNqdy1sPEFkrTk6TUtqLCnBlo3N7TNYYkzzN7uSD6+jVjrdO4+p8nH7JzH6cIvUem6A==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-3.4.0.tgz", + "integrity": "sha512-bXfOC4QcT1tKXGorxL3wbJm6XJPDqEnij2gQ2m7ESQuE+/z9YFIWnl/5RpTiKWbMq3EVKR4fRLJGn6DVfu0mpw==", "dev": true, "license": "MIT", - "dependencies": { - "slice-ansi": "^7.1.0", - "string-width": "^8.0.0" - }, "engines": { - "node": ">=20" + "node": ">=18.20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/cli-truncate/node_modules/string-width": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.0.tgz", - "integrity": "sha512-6hJPQ8N0V0P3SNmP6h2J99RLuzrWz2gvT7VnK5tKvrNqJoyS9W4/Fb8mo31UiPvy00z7DQXkP2hnKBVav76thw==", + "node_modules/cli-truncate": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.2.0.tgz", + "integrity": "sha512-xRwvIOMGrfOAnM1JYtqQImuaNtDEv9v6oIYAs4LIHwTiKee8uwvIi363igssOC0O5U04i4AlENs79LQLu9tEMw==", "dev": true, "license": "MIT", "dependencies": { - "get-east-asian-width": "^1.5.0", - "strip-ansi": "^7.1.2" + "slice-ansi": "^8.0.0", + "string-width": "^8.2.0" }, "engines": { "node": ">=20" @@ -8210,13 +7520,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/cliui/node_modules/emoji-regex": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.5.0.tgz", - "integrity": "sha512-lb49vf1Xzfx080OKA0o6l8DQQpV+6Vg95zyCJX9VB/BqKYlhG7N4wgROUUHRA+ZPUefLnteQOad7z1kT2bV7bg==", - "dev": true, - "license": "MIT" - }, "node_modules/cliui/node_modules/string-width": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", @@ -8335,13 +7638,6 @@ "simple-swizzle": "^0.2.2" } }, - "node_modules/colorette": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", - "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", - "dev": true, - "license": "MIT" - }, "node_modules/compress-commons": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz", @@ -8397,9 +7693,9 @@ "license": "MIT" }, "node_modules/content-disposition": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz", - "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.1.0.tgz", + "integrity": "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==", "dev": true, "license": "MIT", "engines": { @@ -8833,6 +8129,13 @@ "dev": true, "license": "ISC" }, + "node_modules/emoji-regex": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", + "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "dev": true, + "license": "MIT" + }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -9010,9 +8313,9 @@ } }, "node_modules/esbuild": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.3.tgz", - "integrity": "sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz", + "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -9023,32 +8326,32 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.27.3", - "@esbuild/android-arm": "0.27.3", - "@esbuild/android-arm64": "0.27.3", - "@esbuild/android-x64": "0.27.3", - "@esbuild/darwin-arm64": "0.27.3", - "@esbuild/darwin-x64": "0.27.3", - "@esbuild/freebsd-arm64": "0.27.3", - "@esbuild/freebsd-x64": "0.27.3", - "@esbuild/linux-arm": "0.27.3", - "@esbuild/linux-arm64": "0.27.3", - "@esbuild/linux-ia32": "0.27.3", - "@esbuild/linux-loong64": "0.27.3", - "@esbuild/linux-mips64el": "0.27.3", - "@esbuild/linux-ppc64": "0.27.3", - "@esbuild/linux-riscv64": "0.27.3", - "@esbuild/linux-s390x": "0.27.3", - "@esbuild/linux-x64": "0.27.3", - "@esbuild/netbsd-arm64": "0.27.3", - "@esbuild/netbsd-x64": "0.27.3", - "@esbuild/openbsd-arm64": "0.27.3", - "@esbuild/openbsd-x64": "0.27.3", - "@esbuild/openharmony-arm64": "0.27.3", - "@esbuild/sunos-x64": "0.27.3", - "@esbuild/win32-arm64": "0.27.3", - "@esbuild/win32-ia32": "0.27.3", - "@esbuild/win32-x64": "0.27.3" + "@esbuild/aix-ppc64": "0.27.7", + "@esbuild/android-arm": "0.27.7", + "@esbuild/android-arm64": "0.27.7", + "@esbuild/android-x64": "0.27.7", + "@esbuild/darwin-arm64": "0.27.7", + "@esbuild/darwin-x64": "0.27.7", + "@esbuild/freebsd-arm64": "0.27.7", + "@esbuild/freebsd-x64": "0.27.7", + "@esbuild/linux-arm": "0.27.7", + "@esbuild/linux-arm64": "0.27.7", + "@esbuild/linux-ia32": "0.27.7", + "@esbuild/linux-loong64": "0.27.7", + "@esbuild/linux-mips64el": "0.27.7", + "@esbuild/linux-ppc64": "0.27.7", + "@esbuild/linux-riscv64": "0.27.7", + "@esbuild/linux-s390x": "0.27.7", + "@esbuild/linux-x64": "0.27.7", + "@esbuild/netbsd-arm64": "0.27.7", + "@esbuild/netbsd-x64": "0.27.7", + "@esbuild/openbsd-arm64": "0.27.7", + "@esbuild/openbsd-x64": "0.27.7", + "@esbuild/openharmony-arm64": "0.27.7", + "@esbuild/sunos-x64": "0.27.7", + "@esbuild/win32-arm64": "0.27.7", + "@esbuild/win32-ia32": "0.27.7", + "@esbuild/win32-x64": "0.27.7" } }, "node_modules/escalade": { @@ -9321,9 +8624,9 @@ } }, "node_modules/esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", + "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -9397,9 +8700,9 @@ } }, "node_modules/eventsource-parser": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.6.tgz", - "integrity": "sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.1.0.tgz", + "integrity": "sha512-kJezFj9YFAMLeORyi7aCLxLbD5/qWMQnoMVlVPyHIll7lgRJCc3JVln9Vgl9nwQi0YkMnhdGTMNn7CkRRAptMg==", "dev": true, "license": "MIT", "engines": { @@ -9478,9 +8781,9 @@ } }, "node_modules/express-rate-limit": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.5.1.tgz", - "integrity": "sha512-5O6KYmyJEpuPJV5hNTXKbAHWRqrzyu+OI3vUnSd2kXFubIVpG7ezpgxQy76Zo5GQZtrQBg86hF+CM/NX+cioiQ==", + "version": "8.5.2", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.5.2.tgz", + "integrity": "sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==", "dev": true, "license": "MIT", "dependencies": { @@ -9511,22 +8814,36 @@ } }, "node_modules/express/node_modules/body-parser": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", - "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.3.0.tgz", + "integrity": "sha512-2cGmJupaNgg+QUwVLAucDuWuoMZ6EX9iHDRswZ5lsNYEmwPaRknMPCLZz07yTzVq/83p4o/wzbDZbBrTvGGTIw==", "dev": true, "license": "MIT", "dependencies": { "bytes": "^3.1.2", - "content-type": "^1.0.5", + "content-type": "^2.0.0", "debug": "^4.4.3", - "http-errors": "^2.0.0", - "iconv-lite": "^0.7.0", + "http-errors": "^2.0.1", + "iconv-lite": "^0.7.2", "on-finished": "^2.4.1", - "qs": "^6.14.1", - "raw-body": "^3.0.1", - "type-is": "^2.0.1" + "qs": "^6.15.2", + "raw-body": "^3.0.2", + "type-is": "^2.1.0" + }, + "engines": { + "node": ">=18" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/express/node_modules/body-parser/node_modules/content-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.0.0.tgz", + "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==", + "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -9568,9 +8885,9 @@ } }, "node_modules/express/node_modules/iconv-lite": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", - "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz", + "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==", "dev": true, "license": "MIT", "dependencies": { @@ -9648,18 +8965,36 @@ } }, "node_modules/express/node_modules/type-is": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", - "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.1.0.tgz", + "integrity": "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==", "dev": true, "license": "MIT", "dependencies": { - "content-type": "^1.0.5", + "content-type": "^2.0.0", "media-typer": "^1.1.0", "mime-types": "^3.0.0" }, "engines": { - "node": ">= 0.6" + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/express/node_modules/type-is/node_modules/content-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.0.0.tgz", + "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/extend": { @@ -9709,6 +9044,23 @@ "dev": true, "license": "MIT" }, + "node_modules/fast-string-truncated-width": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/fast-string-truncated-width/-/fast-string-truncated-width-3.0.3.tgz", + "integrity": "sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-string-width": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/fast-string-width/-/fast-string-width-3.0.2.tgz", + "integrity": "sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-string-truncated-width": "^3.0.2" + } + }, "node_modules/fast-uri": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", @@ -9726,6 +9078,16 @@ ], "license": "BSD-3-Clause" }, + "node_modules/fast-wrap-ansi": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/fast-wrap-ansi/-/fast-wrap-ansi-0.2.2.tgz", + "integrity": "sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-string-width": "^3.0.2" + } + }, "node_modules/fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", @@ -10321,9 +9683,9 @@ } }, "node_modules/hono": { - "version": "4.12.26", - "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.26.tgz", - "integrity": "sha512-uyZtpnYxM9CmQ7QsQknM4zN8EftNqhON1qYeIKM0Se67CCEe2c44xyGURwB0axX2fBDu1dqHrHAc1hmNT8ITkw==", + "version": "4.12.30", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.30.tgz", + "integrity": "sha512-emn+JoJjrN9YTpRDS5it/UI2SO9BAE37T6I3d963RxcZ81G9A4pr2SZTEiiaiKbzx+NKRg5BZ89fCL7gCJCUog==", "dev": true, "license": "MIT", "engines": { @@ -10553,9 +9915,9 @@ "license": "MIT" }, "node_modules/immutable": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz", - "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.9.tgz", + "integrity": "sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg==", "dev": true, "license": "MIT" }, @@ -10874,9 +10236,9 @@ "license": "MIT" }, "node_modules/jose": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/jose/-/jose-6.1.3.tgz", - "integrity": "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/jose/-/jose-6.2.3.tgz", + "integrity": "sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw==", "dev": true, "license": "MIT", "funding": { @@ -11559,21 +10921,20 @@ "license": "ISC" }, "node_modules/listr2": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.5.tgz", - "integrity": "sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==", + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-10.2.1.tgz", + "integrity": "sha512-7I5knELsJKTUjXG+A6BkKAiGkW1i25fNa/xlUl9hFtk15WbE9jndA89xu5FzQKrY5llajE1hfZZFMILXkDHk/Q==", "dev": true, "license": "MIT", "dependencies": { - "cli-truncate": "^5.0.0", - "colorette": "^2.0.20", - "eventemitter3": "^5.0.1", + "cli-truncate": "^5.2.0", + "eventemitter3": "^5.0.4", "log-update": "^6.1.0", "rfdc": "^1.4.1", - "wrap-ansi": "^9.0.0" + "wrap-ansi": "^10.0.0" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.13.0" } }, "node_modules/listr2/node_modules/ansi-styles": { @@ -11589,13 +10950,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/listr2/node_modules/emoji-regex": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", - "dev": true, - "license": "MIT" - }, "node_modules/listr2/node_modules/eventemitter3": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz", @@ -11603,46 +10957,28 @@ "dev": true, "license": "MIT" }, - "node_modules/listr2/node_modules/string-width": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^10.3.0", - "get-east-asian-width": "^1.0.0", - "strip-ansi": "^7.1.0" - }, - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/listr2/node_modules/wrap-ansi": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", - "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-10.0.0.tgz", + "integrity": "sha512-SGcvg80f0wUy2/fXES19feHMz8E0JoXv2uNgHOu4Dgi2OrCy1lqwFYEJz1BLbDI0exjPMe/ZdzZ/YpGECBG/aQ==", "dev": true, "license": "MIT", "dependencies": { - "ansi-styles": "^6.2.1", - "string-width": "^7.0.0", - "strip-ansi": "^7.1.0" + "ansi-styles": "^6.2.3", + "string-width": "^8.2.0", + "strip-ansi": "^7.1.2" }, "engines": { - "node": ">=18" + "node": ">=20" }, "funding": { "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, "node_modules/lmdb": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.5.1.tgz", - "integrity": "sha512-NYHA0MRPjvNX+vSw8Xxg6FLKxzAG+e7Pt8RqAQA/EehzHVXq9SxDqJIN3JL1hK0dweb884y8kIh6rkWvPyg9Wg==", + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.5.4.tgz", + "integrity": "sha512-9FKQA6G1MMtqNxfxvSBNXD/axeG2QRjYbNh0/ykRL5xYcRbCm2vXq7B9bhc7nSuKdHzr8/BHIwfPuYYH1UsXXw==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -11659,13 +10995,13 @@ "download-lmdb-prebuilds": "bin/download-prebuilds.js" }, "optionalDependencies": { - "@lmdb/lmdb-darwin-arm64": "3.5.1", - "@lmdb/lmdb-darwin-x64": "3.5.1", - "@lmdb/lmdb-linux-arm": "3.5.1", - "@lmdb/lmdb-linux-arm64": "3.5.1", - "@lmdb/lmdb-linux-x64": "3.5.1", - "@lmdb/lmdb-win32-arm64": "3.5.1", - "@lmdb/lmdb-win32-x64": "3.5.1" + "@lmdb/lmdb-darwin-arm64": "3.5.4", + "@lmdb/lmdb-darwin-x64": "3.5.4", + "@lmdb/lmdb-linux-arm": "3.5.4", + "@lmdb/lmdb-linux-arm64": "3.5.4", + "@lmdb/lmdb-linux-x64": "3.5.4", + "@lmdb/lmdb-win32-arm64": "3.5.4", + "@lmdb/lmdb-win32-x64": "3.5.4" } }, "node_modules/locate-path": { @@ -11833,12 +11169,22 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/log-update/node_modules/emoji-regex": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", + "node_modules/log-update/node_modules/slice-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz", + "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==", "dev": true, - "license": "MIT" + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.2.1", + "is-fullwidth-code-point": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } }, "node_modules/log-update/node_modules/string-width": { "version": "7.2.0", @@ -12312,9 +11658,9 @@ "license": "MIT" }, "node_modules/msgpackr": { - "version": "1.11.8", - "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.8.tgz", - "integrity": "sha512-bC4UGzHhVvgDNS7kn9tV8fAucIYUBuGojcaLiz7v+P63Lmtm0Xeji8B/8tYKddALXxJLpwIeBmUN3u64C4YkRA==", + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.12.1.tgz", + "integrity": "sha512-4EUH9tQHnMmEgzW/MdAP0KIfa1T9AF+htl0ffe2n5vb2EKn9y2co8ccpgWko6S52Jy1PQZKwRnx5/KkYjtd9MQ==", "dev": true, "license": "MIT", "optional": true, @@ -12323,9 +11669,9 @@ } }, "node_modules/msgpackr-extract": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz", - "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.4.tgz", + "integrity": "sha512-4kmO/MdyUIkLIvTPr8VHLil4AtoKIoniWPIEk5+CDy0xnWC84azhSFmuJ7PxZdsYtiP5kEeQsORAVIeMgxT+Hw==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -12337,22 +11683,22 @@ "download-msgpackr-prebuilds": "bin/download-prebuilds.js" }, "optionalDependencies": { - "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3", - "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3", - "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3", - "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3", - "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3", - "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3" + "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.4", + "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.4", + "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.4", + "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.4", + "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.4", + "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.4" } }, "node_modules/mute-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz", - "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-3.0.0.tgz", + "integrity": "sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==", "dev": true, "license": "ISC", "engines": { - "node": "^18.17.0 || >=20.5.0" + "node": "^20.17.0 || >=22.9.0" } }, "node_modules/mux.js": { @@ -12373,9 +11719,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "version": "3.3.16", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz", + "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==", "dev": true, "funding": [ { @@ -12409,16 +11755,16 @@ } }, "node_modules/ngx-cookie-service": { - "version": "21.3.1", - "resolved": "https://registry.npmjs.org/ngx-cookie-service/-/ngx-cookie-service-21.3.1.tgz", - "integrity": "sha512-8VEA2W7W2W3yPXhemJoVtXxr+3WW2DNLV4OaCIKDzLdzUUxJ6SzPHMmXXa26Pg8pa+fZxHK1hZfqJfUxr9RMBw==", + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/ngx-cookie-service/-/ngx-cookie-service-22.0.0.tgz", + "integrity": "sha512-7V8am8MqTr7R1xCePfo3w+AfbunNQl+vaWPAeLtIruhsAqBXp0uunh4mYv+ikrYrdPg9pqBjckCX3ubNv8HX7w==", "license": "MIT", "dependencies": { "tslib": "^2.8.1" }, "peerDependencies": { - "@angular/common": "^21.0.0", - "@angular/core": "^21.0.0" + "@angular/common": "^22.0.0", + "@angular/core": "^22.0.0" } }, "node_modules/ngx-date-fns": { @@ -12436,16 +11782,16 @@ } }, "node_modules/ngx-device-detector": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/ngx-device-detector/-/ngx-device-detector-11.0.0.tgz", - "integrity": "sha512-vQ07MpUvVKgxGMPmNvbZ9mUcgH4cH0KMVCj9skMOciPh4sBUKNsorWE/FUs2eSYiLbtu7oq1JcPMcRuEWZ1rug==", + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/ngx-device-detector/-/ngx-device-detector-12.0.0.tgz", + "integrity": "sha512-n9mlKvClPP3El+pj7+v6/C+ywm4iq+xz2Jh5GRV3TH9dEc1yycvzh6lRCjd/d1ymLmGRHAD5cBlDIo5jfs1F7w==", "license": "MIT", "dependencies": { "tslib": "^2.8.1" }, "peerDependencies": { - "@angular/common": "^21.0.0", - "@angular/core": "^21.0.0" + "@angular/common": "^22.0.0", + "@angular/core": "^22.0.0" } }, "node_modules/ngx-file-drop": { @@ -12796,9 +12142,9 @@ } }, "node_modules/ora": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/ora/-/ora-9.3.0.tgz", - "integrity": "sha512-lBX72MWFduWEf7v7uWf5DHp9Jn5BI8bNPGuFgtXMmr2uDz2Gz2749y3am3agSDdkhHPHYmmxEGSKH85ZLGzgXw==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/ora/-/ora-9.4.0.tgz", + "integrity": "sha512-84cglkRILFxdtA8hAvLNdMrtBpPNBTrQ9/ulg0FA7xLMnD6mifv+enAIeRmvtv+WgdCE+LPGOfQmtJRrVaIVhQ==", "dev": true, "license": "MIT", "dependencies": { @@ -12808,7 +12154,7 @@ "is-interactive": "^2.0.0", "is-unicode-supported": "^2.1.0", "log-symbols": "^7.0.1", - "stdin-discarder": "^0.3.1", + "stdin-discarder": "^0.3.2", "string-width": "^8.1.0" }, "engines": { @@ -12831,23 +12177,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/ora/node_modules/string-width": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.0.tgz", - "integrity": "sha512-6hJPQ8N0V0P3SNmP6h2J99RLuzrWz2gvT7VnK5tKvrNqJoyS9W4/Fb8mo31UiPvy00z7DQXkP2hnKBVav76thw==", - "dev": true, - "license": "MIT", - "dependencies": { - "get-east-asian-width": "^1.5.0", - "strip-ansi": "^7.1.2" - }, - "engines": { - "node": ">=20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/ordered-binary": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.6.1.tgz", @@ -12986,13 +12315,13 @@ } }, "node_modules/parse5-html-rewriting-stream": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-8.0.0.tgz", - "integrity": "sha512-wzh11mj8KKkno1pZEu+l2EVeWsuKDfR5KNWZOTsslfUX8lPDZx77m9T0kIoAVkFtD1nx6YF8oh4BnPHvxMtNMw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-8.0.1.tgz", + "integrity": "sha512-NaRku2aMpUN1Sh1Gyk1KWUh2A7EJx2c6qYzvwsPtqhoHoaURshdrceYK3LunVCm3WHhm6FS7Vcczbvdh3/UIVw==", "dev": true, "license": "MIT", "dependencies": { - "entities": "^6.0.0", + "entities": "^8.0.0", "parse5": "^8.0.0", "parse5-sax-parser": "^8.0.0" }, @@ -13001,13 +12330,13 @@ } }, "node_modules/parse5-html-rewriting-stream/node_modules/entities": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", - "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-8.0.0.tgz", + "integrity": "sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==", "dev": true, "license": "BSD-2-Clause", "engines": { - "node": ">=0.12" + "node": ">=20.19.0" }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" @@ -13111,9 +12440,9 @@ } }, "node_modules/path-to-regexp": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", - "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz", + "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==", "dev": true, "license": "MIT", "funding": { @@ -13228,9 +12557,9 @@ "license": "MIT" }, "node_modules/postcss": { - "version": "8.5.12", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.12.tgz", - "integrity": "sha512-W62t/Se6rA0Az3DfCL0AqJwXuKwBeYg6nOaIgzP+xZ7N5BFCI7DYi1qs6ygUYT6rvfi6t9k65UMLJC+PHZpDAA==", + "version": "8.5.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.18.tgz", + "integrity": "sha512-xdB1oSLHbz1vRWgCDalrCqEFTWzFlhqFC5tIHLMOSUIjhm3XXQ1qrFy8S/ESr1JYRRXqM3c1QFiMZUJdUTqyMQ==", "dev": true, "funding": [ { @@ -13248,7 +12577,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.11", + "nanoid": "^3.3.12", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -13773,13 +13102,13 @@ } }, "node_modules/readdirp": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", - "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", + "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==", "dev": true, "license": "MIT", "engines": { - "node": ">= 14.18.0" + "node": ">= 20.19.0" }, "funding": { "type": "individual", @@ -13938,42 +13267,10 @@ "node": "*" } }, - "node_modules/rolldown": { - "version": "1.0.0-rc.4", - "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.0-rc.4.tgz", - "integrity": "sha512-V2tPDUrY3WSevrvU2E41ijZlpF+5PbZu4giH+VpNraaadsJGHa4fR6IFwsocVwEXDoAdIv5qgPPxgrvKAOIPtA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@oxc-project/types": "=0.113.0", - "@rolldown/pluginutils": "1.0.0-rc.4" - }, - "bin": { - "rolldown": "bin/cli.mjs" - }, - "engines": { - "node": "^20.19.0 || >=22.12.0" - }, - "optionalDependencies": { - "@rolldown/binding-android-arm64": "1.0.0-rc.4", - "@rolldown/binding-darwin-arm64": "1.0.0-rc.4", - "@rolldown/binding-darwin-x64": "1.0.0-rc.4", - "@rolldown/binding-freebsd-x64": "1.0.0-rc.4", - "@rolldown/binding-linux-arm-gnueabihf": "1.0.0-rc.4", - "@rolldown/binding-linux-arm64-gnu": "1.0.0-rc.4", - "@rolldown/binding-linux-arm64-musl": "1.0.0-rc.4", - "@rolldown/binding-linux-x64-gnu": "1.0.0-rc.4", - "@rolldown/binding-linux-x64-musl": "1.0.0-rc.4", - "@rolldown/binding-openharmony-arm64": "1.0.0-rc.4", - "@rolldown/binding-wasm32-wasi": "1.0.0-rc.4", - "@rolldown/binding-win32-arm64-msvc": "1.0.0-rc.4", - "@rolldown/binding-win32-x64-msvc": "1.0.0-rc.4" - } - }, "node_modules/rollup": { - "version": "4.59.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz", - "integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==", + "version": "4.60.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.2.tgz", + "integrity": "sha512-J9qZyW++QK/09NyN/zeO0dG/1GdGfyp9lV8ajHnRVLfo/uFsbji5mHnDgn/qYdUHyCkM2N+8VyspgZclfAh0eQ==", "dev": true, "license": "MIT", "dependencies": { @@ -13987,31 +13284,31 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.59.0", - "@rollup/rollup-android-arm64": "4.59.0", - "@rollup/rollup-darwin-arm64": "4.59.0", - "@rollup/rollup-darwin-x64": "4.59.0", - "@rollup/rollup-freebsd-arm64": "4.59.0", - "@rollup/rollup-freebsd-x64": "4.59.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.59.0", - "@rollup/rollup-linux-arm-musleabihf": "4.59.0", - "@rollup/rollup-linux-arm64-gnu": "4.59.0", - "@rollup/rollup-linux-arm64-musl": "4.59.0", - "@rollup/rollup-linux-loong64-gnu": "4.59.0", - "@rollup/rollup-linux-loong64-musl": "4.59.0", - "@rollup/rollup-linux-ppc64-gnu": "4.59.0", - "@rollup/rollup-linux-ppc64-musl": "4.59.0", - "@rollup/rollup-linux-riscv64-gnu": "4.59.0", - "@rollup/rollup-linux-riscv64-musl": "4.59.0", - "@rollup/rollup-linux-s390x-gnu": "4.59.0", - "@rollup/rollup-linux-x64-gnu": "4.59.0", - "@rollup/rollup-linux-x64-musl": "4.59.0", - "@rollup/rollup-openbsd-x64": "4.59.0", - "@rollup/rollup-openharmony-arm64": "4.59.0", - "@rollup/rollup-win32-arm64-msvc": "4.59.0", - "@rollup/rollup-win32-ia32-msvc": "4.59.0", - "@rollup/rollup-win32-x64-gnu": "4.59.0", - "@rollup/rollup-win32-x64-msvc": "4.59.0", + "@rollup/rollup-android-arm-eabi": "4.60.2", + "@rollup/rollup-android-arm64": "4.60.2", + "@rollup/rollup-darwin-arm64": "4.60.2", + "@rollup/rollup-darwin-x64": "4.60.2", + "@rollup/rollup-freebsd-arm64": "4.60.2", + "@rollup/rollup-freebsd-x64": "4.60.2", + "@rollup/rollup-linux-arm-gnueabihf": "4.60.2", + "@rollup/rollup-linux-arm-musleabihf": "4.60.2", + "@rollup/rollup-linux-arm64-gnu": "4.60.2", + "@rollup/rollup-linux-arm64-musl": "4.60.2", + "@rollup/rollup-linux-loong64-gnu": "4.60.2", + "@rollup/rollup-linux-loong64-musl": "4.60.2", + "@rollup/rollup-linux-ppc64-gnu": "4.60.2", + "@rollup/rollup-linux-ppc64-musl": "4.60.2", + "@rollup/rollup-linux-riscv64-gnu": "4.60.2", + "@rollup/rollup-linux-riscv64-musl": "4.60.2", + "@rollup/rollup-linux-s390x-gnu": "4.60.2", + "@rollup/rollup-linux-x64-gnu": "4.60.2", + "@rollup/rollup-linux-x64-musl": "4.60.2", + "@rollup/rollup-openbsd-x64": "4.60.2", + "@rollup/rollup-openharmony-arm64": "4.60.2", + "@rollup/rollup-win32-arm64-msvc": "4.60.2", + "@rollup/rollup-win32-ia32-msvc": "4.60.2", + "@rollup/rollup-win32-x64-gnu": "4.60.2", + "@rollup/rollup-win32-x64-msvc": "4.60.2", "fsevents": "~2.3.2" } }, @@ -14093,14 +13390,14 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.97.3", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.97.3.tgz", - "integrity": "sha512-fDz1zJpd5GycprAbu4Q2PV/RprsRtKC/0z82z0JLgdytmcq0+ujJbJ/09bPGDxCLkKY3Np5cRAOcWiVkLXJURg==", + "version": "1.99.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.99.0.tgz", + "integrity": "sha512-kgW13M54DUB7IsIRM5LvJkNlpH+WhMpooUcaWGFARkF1Tc82v9mIWkCbCYf+MBvpIUBSeSOTilpZjEPr2VYE6Q==", "dev": true, "license": "MIT", "dependencies": { "chokidar": "^4.0.0", - "immutable": "^5.0.2", + "immutable": "^5.1.5", "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { @@ -14113,6 +13410,36 @@ "@parcel/watcher": "^2.4.1" } }, + "node_modules/sass/node_modules/chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/sass/node_modules/readdirp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/sax": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.3.tgz", @@ -14407,17 +13734,17 @@ } }, "node_modules/slice-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz", - "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-8.0.0.tgz", + "integrity": "sha512-stxByr12oeeOyY2BlviTNQlYV5xOj47GirPr4yA1hE9JCtxfQN0+tVbkxwCtYDQWhEKWFHsEK48ORg5jrouCAg==", "dev": true, "license": "MIT", "dependencies": { - "ansi-styles": "^6.2.1", - "is-fullwidth-code-point": "^5.0.0" + "ansi-styles": "^6.2.3", + "is-fullwidth-code-point": "^5.1.0" }, "engines": { - "node": ">=18" + "node": ">=20" }, "funding": { "url": "https://github.com/chalk/slice-ansi?sponsor=1" @@ -14665,9 +13992,9 @@ } }, "node_modules/stdin-discarder": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.3.1.tgz", - "integrity": "sha512-reExS1kSGoElkextOcPkel4NE99S0BWxjUHQeDFnR8S993JxpPX7KU4MNmO19NXhlJp+8dmdCbKQVNgLJh2teA==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.3.2.tgz", + "integrity": "sha512-eCPu1qRxPVkl5605OTWF8Wz40b4Mf45NY5LQmVPQ599knfs5QhASUm9GbJ5BDMDOXgrnh0wyEdvzmL//YMlw0A==", "dev": true, "license": "MIT", "engines": { @@ -14701,6 +14028,23 @@ "safe-buffer": "~5.2.0" } }, + "node_modules/string-width": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.2.tgz", + "integrity": "sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-east-asian-width": "^1.5.0", + "strip-ansi": "^7.1.2" + }, + "engines": { + "node": ">=20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/strip-ansi": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", @@ -14825,14 +14169,14 @@ "license": "MIT" }, "node_modules/tinyglobby": { - "version": "0.2.15", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", - "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", + "version": "0.2.16", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz", + "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==", "dev": true, "license": "MIT", "dependencies": { "fdir": "^6.5.0", - "picomatch": "^4.0.3" + "picomatch": "^4.0.4" }, "engines": { "node": ">=12.0.0" @@ -15024,9 +14368,9 @@ } }, "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -15088,16 +14432,6 @@ "node": "*" } }, - "node_modules/undici": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.28.0.tgz", - "integrity": "sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=20.18.1" - } - }, "node_modules/undici-types": { "version": "7.16.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", @@ -15354,13 +14688,13 @@ } }, "node_modules/vite": { - "version": "7.3.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.6.tgz", - "integrity": "sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==", + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.5.tgz", + "integrity": "sha512-KuOaNhcnGFN2zIPGA7wRmzF+lJA1sea7rHq17aiJ++9lzY1WWG6Jpwqwe1KNbRVPIqHmr8GLYx7jbrQcN/7/ww==", "dev": true, "license": "MIT", "dependencies": { - "esbuild": "^0.27.0 || ^0.28.0", + "esbuild": "^0.27.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", @@ -15653,13 +14987,6 @@ "node": "^20.19.0 || ^22.12.0 || >=23" } }, - "node_modules/yargs/node_modules/emoji-regex": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.5.0.tgz", - "integrity": "sha512-lb49vf1Xzfx080OKA0o6l8DQQpV+6Vg95zyCJX9VB/BqKYlhG7N4wgROUUHRA+ZPUefLnteQOad7z1kT2bV7bg==", - "dev": true, - "license": "MIT" - }, "node_modules/yargs/node_modules/string-width": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", @@ -15714,19 +15041,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/yoctocolors-cjs": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.3.tgz", - "integrity": "sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/zip-stream": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz", @@ -15806,29 +15120,28 @@ } }, "node_modules/zod": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz", - "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==", - "dev": true, + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.2.tgz", + "integrity": "sha512-IynmDyxsEsb9RKzO3J9+4SxXnl2FTFSzNBaKKaMV6tsSk0rw9gYw9gs+JFCq/qk2LCZ78KDwyj+Z289TijSkUw==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/colinhacks" } }, "node_modules/zod-to-json-schema": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.1.tgz", - "integrity": "sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==", + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.2.tgz", + "integrity": "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==", "dev": true, "license": "ISC", "peerDependencies": { - "zod": "^3.25 || ^4" + "zod": "^3.25.28 || ^4" } }, "node_modules/zone.js": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.16.1.tgz", - "integrity": "sha512-dpvY17vxYIW3+bNrP0ClUlaiY0CiIRK3tnoLaGoQsQcY9/I/NpzIWQ7tQNhbV7LacQMpCII6wVzuL3tuWOyfuA==", + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.16.2.tgz", + "integrity": "sha512-Eky7p2Z1Ig3NnbfodSPoARCjKBSTFMnE/ACsP1L/XJEfY4SdOFce19BsUCWVwL6K5ABZFy5J3bjcMWffX+YM3Q==", "license": "MIT" } } diff --git a/client/package.json b/client/package.json index f09044f04d..40222c6010 100644 --- a/client/package.json +++ b/client/package.json @@ -32,25 +32,25 @@ "get-available-languages": "npm run ts -- cli/get-available-languages.ts" }, "dependencies": { - "@angular/animations": "^21.2.16", - "@angular/cdk": "^21.2.14", - "@angular/common": "^21.2.17", - "@angular/compiler": "^21.2.17", - "@angular/core": "^21.2.17", - "@angular/forms": "^21.2.17", - "@angular/material": "^21.2.14", - "@angular/material-date-fns-adapter": "^21.2.14", - "@angular/platform-browser": "^21.2.17", - "@angular/platform-browser-dynamic": "^21.2.17", - "@angular/router": "^21.2.17", - "@angular/service-worker": "^21.2.17", + "@angular/animations": "^22.0.6", + "@angular/cdk": "^22.0.4", + "@angular/common": "^22.0.6", + "@angular/compiler": "^22.0.6", + "@angular/core": "^22.0.6", + "@angular/forms": "^22.0.6", + "@angular/material": "^22.0.4", + "@angular/material-date-fns-adapter": "^22.0.4", + "@angular/platform-browser": "^22.0.6", + "@angular/platform-browser-dynamic": "^22.0.6", + "@angular/router": "^22.0.6", + "@angular/service-worker": "^22.0.6", "@cantoo/pdf-lib": "^2.7.1", - "@coreui/angular-chartjs": "~5.6.25", + "@coreui/angular-chartjs": "~5.7.3", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", "@intevation/tiptap-extension-office-paste": "^0.1.2", "@material/typography": "^14.0.0", - "@ngx-pwa/local-storage": "^21.0.0", + "@ngx-pwa/local-storage": "^22.0.0", "@ngx-translate/core": "^17.0.0", "@ngx-translate/http-loader": "^17.0.0", "@openslides/motion-diff": "file:../packages/openslides-motion-diff", @@ -83,9 +83,9 @@ "jszip": "^3.10.1", "lodash-es": "^4.18.1", "material-design-icons-iconfont": "^6.7.0", - "ngx-cookie-service": "^21.3.1", + "ngx-cookie-service": "^22.0.0", "ngx-date-fns": "^12.0.1", - "ngx-device-detector": "^11.0.0", + "ngx-device-detector": "^12.0.0", "ngx-file-drop": "^16.0.0", "ngx-papaparse": "^8.0.0", "pdfmake": "^0.3.11", @@ -94,19 +94,18 @@ "rxjs": "^7.8.2", "tinycolor2": "1.6.0", "video.js": "^8.23.9", - "zone.js": "^0.16.1" + "zone.js": "^0.16.2" }, "devDependencies": { - "@angular-eslint/builder": "^21.4.0", - "@angular-eslint/eslint-plugin": "^21.4.0", - "@angular-eslint/eslint-plugin-template": "^21.4.0", - "@angular-eslint/schematics": "^21.4.0", - "@angular-eslint/template-parser": "^21.3.0", - "@angular/build": "^21.2.18", - "@angular/cli": "^21.2.18", - "@angular/compiler-cli": "^21.2.17", - "@angular/language-server": "^21.2.17", - "@coreui/angular-chartjs": "^5.6.25", + "@angular-eslint/builder": "^22.1.0", + "@angular-eslint/eslint-plugin": "^22.1.0", + "@angular-eslint/eslint-plugin-template": "^22.1.0", + "@angular-eslint/schematics": "^22.1.0", + "@angular-eslint/template-parser": "^22.1.0", + "@angular/build": "^22.0.6", + "@angular/cli": "^22.0.6", + "@angular/compiler-cli": "^22.0.6", + "@angular/language-server": "^22.0.6", "@stylistic/eslint-plugin": "^5.10.0", "@types/file-saver": "^2.0.7", "@types/jasmine": "~5.1.15", @@ -118,14 +117,15 @@ "@types/video.js": "^7.3.58", "@typescript-eslint/eslint-plugin": "^8.63.0", "@typescript-eslint/parser": "^8.63.0", - "@vendure/ngx-translate-extract": "^10.1.3", - "angular-eslint": "^21.4.0", + "@vendure/ngx-translate-extract": "^10.2.0", + "angular-eslint": "^22.1.0", "eslint": "^9.39.4", "eslint-config-prettier": "^10.1.8", "eslint-plugin-prettier": "^5.5.6", "eslint-plugin-simple-import-sort": "^13.0.0", "eslint-plugin-unused-imports": "^4.4.1", "fetch-mock": "^12.6.0", + "istanbul-lib-instrument": "^6.0.3", "jasmine-core": "^5.13.0", "js-yaml": "^5.2.1", "karma": "~6.4.4", @@ -138,7 +138,7 @@ "ts-morph": "^28.0.0", "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", - "typescript": "^5.9.3", + "typescript": "^6.0.3", "typescript-eslint": "^8.63.0" }, "browser": { diff --git a/client/src/app/domain/fieldsets/misc.ts b/client/src/app/domain/fieldsets/misc.ts index 26c30ee818..31571b4d05 100644 --- a/client/src/app/domain/fieldsets/misc.ts +++ b/client/src/app/domain/fieldsets/misc.ts @@ -1,4 +1,4 @@ -import { BaseSimplifiedModelRequest, Follow, FollowList } from 'src/app/site/services/model-request-builder'; +import { BaseSimplifiedModelRequest, Follow, FollowList } from '@app/site/services/model-request-builder'; /** * Fieldset used if no fieldset is specified diff --git a/client/src/app/domain/fieldsets/user.ts b/client/src/app/domain/fieldsets/user.ts index 165b4c4c32..4c22218bcf 100644 --- a/client/src/app/domain/fieldsets/user.ts +++ b/client/src/app/domain/fieldsets/user.ts @@ -1,4 +1,4 @@ -import { BaseSimplifiedModelRequest } from 'src/app/site/services/model-request-builder'; +import { BaseSimplifiedModelRequest } from '@app/site/services/model-request-builder'; export class UserFieldsets { public static readonly FullNameSubscription: BaseSimplifiedModelRequest = { diff --git a/client/src/app/domain/interfaces/constructable.ts b/client/src/app/domain/interfaces/constructable.ts index abbc16b657..ab7fd7c88c 100644 --- a/client/src/app/domain/interfaces/constructable.ts +++ b/client/src/app/domain/interfaces/constructable.ts @@ -1,4 +1,4 @@ -import { Fqid } from 'src/app/domain/definitions/key-types'; +import { Fqid } from '@app/domain/definitions/key-types'; export interface Constructable { new (...args: any[]): T; prototype: T; diff --git a/client/src/app/domain/interfaces/has-owner-id.ts b/client/src/app/domain/interfaces/has-owner-id.ts index ffe0cfff08..90756d2de3 100644 --- a/client/src/app/domain/interfaces/has-owner-id.ts +++ b/client/src/app/domain/interfaces/has-owner-id.ts @@ -1,4 +1,4 @@ -import { Fqid } from 'src/app/domain/definitions/key-types'; +import { Fqid } from '@app/domain/definitions/key-types'; export interface HasOwnerId { owner_id: Fqid; diff --git a/client/src/app/domain/interfaces/has-poll-ids.ts b/client/src/app/domain/interfaces/has-poll-ids.ts index d816e2eb70..af1ba546ed 100644 --- a/client/src/app/domain/interfaces/has-poll-ids.ts +++ b/client/src/app/domain/interfaces/has-poll-ids.ts @@ -1,4 +1,4 @@ -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; export interface HasPollIds { poll_ids: Id[]; // (poll/content_object_id)[]; diff --git a/client/src/app/domain/interfaces/subscription-config.ts b/client/src/app/domain/interfaces/subscription-config.ts index 579d37d43d..a72ef8ffa0 100644 --- a/client/src/app/domain/interfaces/subscription-config.ts +++ b/client/src/app/domain/interfaces/subscription-config.ts @@ -1,6 +1,6 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { SimplifiedModelRequest } from 'src/app/site/services/model-request-builder'; +import { Id } from '@app/domain/definitions/key-types'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { SimplifiedModelRequest } from '@app/site/services/model-request-builder'; export interface SubscriptionConfig { modelRequest: SimplifiedModelRequest; diff --git a/client/src/app/domain/models/mediafiles/mediafile.ts b/client/src/app/domain/models/mediafiles/mediafile.ts index f28d30f927..666eb682a3 100644 --- a/client/src/app/domain/models/mediafiles/mediafile.ts +++ b/client/src/app/domain/models/mediafiles/mediafile.ts @@ -1,4 +1,4 @@ -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; import { Id } from '../../definitions/key-types'; import { HasOwnerId } from '../../interfaces/has-owner-id'; diff --git a/client/src/app/domain/models/organizations/organization.ts b/client/src/app/domain/models/organizations/organization.ts index 155eeb4124..60717a2e74 100644 --- a/client/src/app/domain/models/organizations/organization.ts +++ b/client/src/app/domain/models/organizations/organization.ts @@ -1,4 +1,4 @@ -import { UnsafeHtml } from 'src/app/domain/definitions/key-types'; +import { UnsafeHtml } from '@app/domain/definitions/key-types'; import { Id } from '../../definitions/key-types'; import { BaseModel } from '../base/base-model'; diff --git a/client/src/app/domain/models/poll/generic-poll.ts b/client/src/app/domain/models/poll/generic-poll.ts index b35cdefc33..4d63966ce0 100644 --- a/client/src/app/domain/models/poll/generic-poll.ts +++ b/client/src/app/domain/models/poll/generic-poll.ts @@ -1,9 +1,9 @@ +import { ViewTopic } from '@app/site/pages/meetings/pages/agenda'; +import { ViewAssignment } from '@app/site/pages/meetings/pages/assignments'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { ViewPollCandidateList } from '@app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { Observable } from 'rxjs'; -import { ViewTopic } from 'src/app/site/pages/meetings/pages/agenda'; -import { ViewAssignment } from 'src/app/site/pages/meetings/pages/assignments'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { ViewPollCandidateList } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; import { EntitledUsersEntry, PollClassType, PollMethod, PollPercentBase, PollState, PollType } from './poll-constants'; diff --git a/client/src/app/domain/models/poll/poll.ts b/client/src/app/domain/models/poll/poll.ts index 5af2dd5f4c..37dee718cf 100644 --- a/client/src/app/domain/models/poll/poll.ts +++ b/client/src/app/domain/models/poll/poll.ts @@ -1,4 +1,4 @@ -import { HasSequentialNumber } from 'src/app/domain/interfaces'; +import { HasSequentialNumber } from '@app/domain/interfaces'; import { Fqid, Id } from '../../definitions/key-types'; import { HasMeetingId } from '../../interfaces/has-meeting-id'; diff --git a/client/src/app/domain/models/projector/projector-countdown.ts b/client/src/app/domain/models/projector/projector-countdown.ts index e29366dba5..cf4372b49f 100644 --- a/client/src/app/domain/models/projector/projector-countdown.ts +++ b/client/src/app/domain/models/projector/projector-countdown.ts @@ -1,4 +1,4 @@ -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; import { HasMeetingId } from '../../interfaces/has-meeting-id'; import { HasProjectionIds } from '../../interfaces/has-projectable-ids'; diff --git a/client/src/app/domain/models/topics/topic.ts b/client/src/app/domain/models/topics/topic.ts index efce43e544..6688da873a 100644 --- a/client/src/app/domain/models/topics/topic.ts +++ b/client/src/app/domain/models/topics/topic.ts @@ -1,4 +1,4 @@ -import { HasPollIds } from 'src/app/domain/interfaces/has-poll-ids'; +import { HasPollIds } from '@app/domain/interfaces/has-poll-ids'; import { HasSequentialNumber } from '../../interfaces'; import { HasAgendaItemId } from '../../interfaces/has-agenda-item-id'; diff --git a/client/src/app/gateways/action-worker-watch/action-worker-watch.service.spec.ts b/client/src/app/gateways/action-worker-watch/action-worker-watch.service.spec.ts index 94f11fa550..95b844845b 100644 --- a/client/src/app/gateways/action-worker-watch/action-worker-watch.service.spec.ts +++ b/client/src/app/gateways/action-worker-watch/action-worker-watch.service.spec.ts @@ -1,5 +1,17 @@ import { HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http'; import { TestBed } from '@angular/core/testing'; +import { SubscriptionConfig } from '@app/domain/interfaces/subscription-config'; +import { ActionWorker, ActionWorkerState } from '@app/domain/models/action-worker/action-worker'; +import { BaseModel } from '@app/domain/models/base/base-model'; +import { copy } from '@app/infrastructure/utils/transform-functions'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { + WaitForActionData, + WaitForActionReason, + waitForActionReason +} from '@app/site/modules/wait-for-action-dialog/definitions'; +import { WaitForActionDialogService } from '@app/site/modules/wait-for-action-dialog/services'; +import { ModelRequestService } from '@app/site/services/model-request.service'; import { BehaviorSubject, filter, @@ -11,18 +23,6 @@ import { startWith, takeUntil } from 'rxjs'; -import { SubscriptionConfig } from 'src/app/domain/interfaces/subscription-config'; -import { ActionWorker, ActionWorkerState } from 'src/app/domain/models/action-worker/action-worker'; -import { BaseModel } from 'src/app/domain/models/base/base-model'; -import { copy } from 'src/app/infrastructure/utils/transform-functions'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { - WaitForActionData, - WaitForActionReason, - waitForActionReason -} from 'src/app/site/modules/wait-for-action-dialog/definitions'; -import { WaitForActionDialogService } from 'src/app/site/modules/wait-for-action-dialog/services'; -import { ModelRequestService } from 'src/app/site/services/model-request.service'; import { ActionWorkerRepositoryService } from '../repositories/action-worker/action-worker-repository.service'; import { ViewActionWorker } from '../repositories/action-worker/view-action-worker'; diff --git a/client/src/app/gateways/action-worker-watch/action-worker-watch.service.ts b/client/src/app/gateways/action-worker-watch/action-worker-watch.service.ts index b8b4078d3f..869dfdbe04 100644 --- a/client/src/app/gateways/action-worker-watch/action-worker-watch.service.ts +++ b/client/src/app/gateways/action-worker-watch/action-worker-watch.service.ts @@ -1,12 +1,12 @@ import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; +import { Id, Ids } from '@app/domain/definitions/key-types'; +import { ActionWorkerState } from '@app/domain/models/action-worker/action-worker'; +import { idFromFqid } from '@app/infrastructure/utils/transform-functions'; +import { WaitForActionReason, waitForActionReason } from '@app/site/modules/wait-for-action-dialog/definitions'; +import { WaitForActionDialogService } from '@app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service'; +import { ModelRequestService } from '@app/site/services/model-request.service'; import { BehaviorSubject, combineLatest, filter, firstValueFrom, map, Observable, timer } from 'rxjs'; -import { Id, Ids } from 'src/app/domain/definitions/key-types'; -import { ActionWorkerState } from 'src/app/domain/models/action-worker/action-worker'; -import { idFromFqid } from 'src/app/infrastructure/utils/transform-functions'; -import { WaitForActionReason, waitForActionReason } from 'src/app/site/modules/wait-for-action-dialog/definitions'; -import { WaitForActionDialogService } from 'src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service'; -import { ModelRequestService } from 'src/app/site/services/model-request.service'; import { ActionWorkerRepositoryService } from '../repositories/action-worker/action-worker-repository.service'; import { ViewActionWorker } from '../repositories/action-worker/view-action-worker'; diff --git a/client/src/app/gateways/action-worker-watch/action-worker-watch.subscription.ts b/client/src/app/gateways/action-worker-watch/action-worker-watch.subscription.ts index fa8b360088..976c97d0ba 100644 --- a/client/src/app/gateways/action-worker-watch/action-worker-watch.subscription.ts +++ b/client/src/app/gateways/action-worker-watch/action-worker-watch.subscription.ts @@ -1,6 +1,6 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; -import { DEFAULT_FIELDSET } from 'src/app/site/services/model-request-builder'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; +import { DEFAULT_FIELDSET } from '@app/site/services/model-request-builder'; import { ViewActionWorker } from '../repositories/action-worker/view-action-worker'; diff --git a/client/src/app/gateways/actions/action.service.spec.ts b/client/src/app/gateways/actions/action.service.spec.ts index 00351f2f1f..17b9f981d5 100644 --- a/client/src/app/gateways/actions/action.service.spec.ts +++ b/client/src/app/gateways/actions/action.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { QueryParams } from 'src/app/infrastructure/definitions/http'; +import { QueryParams } from '@app/infrastructure/definitions/http'; import { HttpService } from '../http.service'; import { Action, createEmptyAction } from './action'; diff --git a/client/src/app/gateways/error-mapping/error-map.service.spec.ts b/client/src/app/gateways/error-mapping/error-map.service.spec.ts index a9e49d0bcc..2758ff8ebd 100644 --- a/client/src/app/gateways/error-mapping/error-map.service.spec.ts +++ b/client/src/app/gateways/error-mapping/error-map.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; +import { MockTranslateService } from '@app/site/pages/meetings/modules/poll/pipes/poll-parse-number/poll-parse-number.pipe.spec'; import { TranslateService } from '@ngx-translate/core'; -import { MockTranslateService } from 'src/app/site/pages/meetings/modules/poll/pipes/poll-parse-number/poll-parse-number.pipe.spec'; import { MeetingAction } from '../repositories/meetings'; import { MotionAction } from '../repositories/motions'; diff --git a/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.spec.ts b/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.spec.ts index af28c94b6e..077460dd58 100644 --- a/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.spec.ts +++ b/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; +import { BaseViewModel } from '@app/site/base/base-view-model'; import { FileExportService } from '../file-export.service'; import { CsvExportForBackendService } from './csv-export-for-backend.service'; diff --git a/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts b/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts index bc8cd864bb..658d3f454a 100644 --- a/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts +++ b/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts @@ -1,5 +1,5 @@ import { inject, Injectable } from '@angular/core'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; +import { BaseViewModel } from '@app/site/base/base-view-model'; import { FileExportService } from '../file-export.service'; import { diff --git a/client/src/app/gateways/export/file-export.service/file-export.service.ts b/client/src/app/gateways/export/file-export.service/file-export.service.ts index fd95adb820..1198f97fda 100644 --- a/client/src/app/gateways/export/file-export.service/file-export.service.ts +++ b/client/src/app/gateways/export/file-export.service/file-export.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; +import { HttpService } from '@app/gateways/http.service'; import { saveAs } from 'file-saver'; import JSZip from 'jszip'; -import { HttpService } from 'src/app/gateways/http.service'; @Injectable({ providedIn: `root` diff --git a/client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.spec.ts b/client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.spec.ts index b2f0098cf5..7c40b708dc 100644 --- a/client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.spec.ts +++ b/client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; import { Content } from 'pdfmake/interfaces'; -import { E2EImportsModule } from 'src/e2e-imports.module'; +import { E2EImportsModule } from '../../../../e2e-imports.module'; import { ExportServiceModule } from '../export-service.module'; import { HtmlToPdfService } from './html-to-pdf.service'; diff --git a/client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.ts b/client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.ts index 4b05f547e9..6838eb9480 100644 --- a/client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.ts +++ b/client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; +import { MEETING_PDF_EXPORT_HEADING_STYLES } from '@app/domain/models/meetings/meeting.constants'; import { Content, ContentColumns } from 'pdfmake/interfaces'; -import { MEETING_PDF_EXPORT_HEADING_STYLES } from 'src/app/domain/models/meetings/meeting.constants'; export interface ChildNodeParagraphPayload { child: Element; diff --git a/client/src/app/gateways/export/pdf-document.service/pdf-document.service.ts b/client/src/app/gateways/export/pdf-document.service/pdf-document.service.ts index d608d597ff..ae7ffa76fa 100644 --- a/client/src/app/gateways/export/pdf-document.service/pdf-document.service.ts +++ b/client/src/app/gateways/export/pdf-document.service/pdf-document.service.ts @@ -1,4 +1,10 @@ import { Injectable } from '@angular/core'; +import { Settings } from '@app/domain/models/meetings/meeting'; +import { MOTION_PDF_OPTIONS } from '@app/domain/models/motions/motions.constants'; +import { Functionable } from '@app/infrastructure/utils'; +import { Deferred } from '@app/infrastructure/utils/promises'; +import { MediaManageService } from '@app/site/pages/meetings/services/media-manage.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; import { TranslateService } from '@ngx-translate/core'; import { saveAs } from 'file-saver'; import { @@ -16,12 +22,6 @@ import { TableCell, TDocumentDefinitions } from 'pdfmake/interfaces'; -import { Settings } from 'src/app/domain/models/meetings/meeting'; -import { MOTION_PDF_OPTIONS } from 'src/app/domain/models/motions/motions.constants'; -import { Functionable } from 'src/app/infrastructure/utils'; -import { Deferred } from 'src/app/infrastructure/utils/promises'; -import { MediaManageService } from 'src/app/site/pages/meetings/services/media-manage.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; import { HttpService } from '../../http.service'; import { ProgressSnackBarService } from '../progress-snack-bar/services/progress-snack-bar.service'; diff --git a/client/src/app/gateways/export/progress-snack-bar/progress-snack-bar.module.ts b/client/src/app/gateways/export/progress-snack-bar/progress-snack-bar.module.ts index 215a7b8cd1..0ab4283278 100644 --- a/client/src/app/gateways/export/progress-snack-bar/progress-snack-bar.module.ts +++ b/client/src/app/gateways/export/progress-snack-bar/progress-snack-bar.module.ts @@ -5,7 +5,7 @@ import { MatIconModule } from '@angular/material/icon'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { ProgressSnackBarComponent } from './components/progress-snack-bar/progress-snack-bar.component'; import { ProgressSnackBarServiceModule } from './services/progress-snack-bar-service.module'; diff --git a/client/src/app/gateways/http-stream/http-stream-endpoint.service.spec.ts b/client/src/app/gateways/http-stream/http-stream-endpoint.service.spec.ts index d81d6d515f..6a8dbcc68b 100644 --- a/client/src/app/gateways/http-stream/http-stream-endpoint.service.spec.ts +++ b/client/src/app/gateways/http-stream/http-stream-endpoint.service.spec.ts @@ -1,6 +1,6 @@ import { HttpHeaders } from '@angular/common/http'; import { TestBed } from '@angular/core/testing'; -import { HttpMethod, QueryParams, ResponseType } from 'src/app/infrastructure/definitions/http'; +import { HttpMethod, QueryParams, ResponseType } from '@app/infrastructure/definitions/http'; import { HttpService } from '../http.service'; import { EndpointConfiguration } from './endpoint-configuration'; diff --git a/client/src/app/gateways/presenter/export-meeting-presenter.service.ts b/client/src/app/gateways/presenter/export-meeting-presenter.service.ts index 637d4ffdbd..5a3abbad1b 100644 --- a/client/src/app/gateways/presenter/export-meeting-presenter.service.ts +++ b/client/src/app/gateways/presenter/export-meeting-presenter.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; import { Presenter } from './presenter'; import { PresenterService } from './presenter.service'; diff --git a/client/src/app/gateways/presenter/get-forwarding-committees-presenter.service.ts b/client/src/app/gateways/presenter/get-forwarding-committees-presenter.service.ts index 9abeaad619..33750d748a 100644 --- a/client/src/app/gateways/presenter/get-forwarding-committees-presenter.service.ts +++ b/client/src/app/gateways/presenter/get-forwarding-committees-presenter.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; import { Presenter } from './presenter'; import { PresenterService } from './presenter.service'; diff --git a/client/src/app/gateways/presenter/get-forwarding-meetings-presenter.service.ts b/client/src/app/gateways/presenter/get-forwarding-meetings-presenter.service.ts index 794b88b760..1e26be5de7 100644 --- a/client/src/app/gateways/presenter/get-forwarding-meetings-presenter.service.ts +++ b/client/src/app/gateways/presenter/get-forwarding-meetings-presenter.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; import { Presenter } from './presenter'; import { PresenterService } from './presenter.service'; diff --git a/client/src/app/gateways/presenter/get-user-editable-presenter.service.ts b/client/src/app/gateways/presenter/get-user-editable-presenter.service.ts index a25278eb64..356aac93fc 100644 --- a/client/src/app/gateways/presenter/get-user-editable-presenter.service.ts +++ b/client/src/app/gateways/presenter/get-user-editable-presenter.service.ts @@ -1,5 +1,5 @@ import { inject, Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; import { Presenter } from './presenter'; import { PresenterService } from './presenter.service'; diff --git a/client/src/app/gateways/presenter/get-user-related-models-presenter.service.spec.ts b/client/src/app/gateways/presenter/get-user-related-models-presenter.service.spec.ts index bd3ab09382..4454ce9614 100644 --- a/client/src/app/gateways/presenter/get-user-related-models-presenter.service.spec.ts +++ b/client/src/app/gateways/presenter/get-user-related-models-presenter.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { CML, OML } from 'src/app/domain/definitions/organization-permission'; +import { CML, OML } from '@app/domain/definitions/organization-permission'; import { GetUserRelatedModelsPresenterResult, diff --git a/client/src/app/gateways/presenter/get-user-scope-presenter.service.spec.ts b/client/src/app/gateways/presenter/get-user-scope-presenter.service.spec.ts index eb7d85ae07..3ea2d71cb6 100644 --- a/client/src/app/gateways/presenter/get-user-scope-presenter.service.spec.ts +++ b/client/src/app/gateways/presenter/get-user-scope-presenter.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { UserScope } from 'src/app/site/services/user.service'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { UserScope } from '@app/site/services/user.service'; import { GetUserScopePresenterService } from './get-user-scope-presenter.service'; import { Presenter } from './presenter'; diff --git a/client/src/app/gateways/presenter/get-user-scope-presenter.service.ts b/client/src/app/gateways/presenter/get-user-scope-presenter.service.ts index a544e72158..a98dc1b691 100644 --- a/client/src/app/gateways/presenter/get-user-scope-presenter.service.ts +++ b/client/src/app/gateways/presenter/get-user-scope-presenter.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { UserScope } from 'src/app/site/services/user.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { UserScope } from '@app/site/services/user.service'; import { Presenter } from './presenter'; import { PresenterService } from './presenter.service'; diff --git a/client/src/app/gateways/presenter/search-users-presenter.service.spec.ts b/client/src/app/gateways/presenter/search-users-presenter.service.spec.ts index 126697e309..d7fc648dd3 100644 --- a/client/src/app/gateways/presenter/search-users-presenter.service.spec.ts +++ b/client/src/app/gateways/presenter/search-users-presenter.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { UserScope } from 'src/app/site/services/user.service'; +import { UserScope } from '@app/site/services/user.service'; import { Presenter } from './presenter'; import { PresenterService } from './presenter.service'; diff --git a/client/src/app/gateways/presenter/search-users-presenter.service.ts b/client/src/app/gateways/presenter/search-users-presenter.service.ts index 0cf86bfccd..1284b34580 100644 --- a/client/src/app/gateways/presenter/search-users-presenter.service.ts +++ b/client/src/app/gateways/presenter/search-users-presenter.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { User } from 'src/app/domain/models/users/user'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { UserScope } from 'src/app/site/services/user.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { User } from '@app/domain/models/users/user'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { UserScope } from '@app/site/services/user.service'; import { Presenter } from './presenter'; import { PresenterService } from './presenter.service'; diff --git a/client/src/app/gateways/repositories/action-worker/action-worker-repository.service.ts b/client/src/app/gateways/repositories/action-worker/action-worker-repository.service.ts index f2482a7e38..e10bd59cfe 100644 --- a/client/src/app/gateways/repositories/action-worker/action-worker-repository.service.ts +++ b/client/src/app/gateways/repositories/action-worker/action-worker-repository.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActionWorker } from 'src/app/domain/models/action-worker/action-worker'; +import { ActionWorker } from '@app/domain/models/action-worker/action-worker'; import { BaseRepository } from '../base-repository'; import { RepositoryServiceCollectorService } from '../repository-service-collector.service'; diff --git a/client/src/app/gateways/repositories/action-worker/action-worker.config.ts b/client/src/app/gateways/repositories/action-worker/action-worker.config.ts index 8d4a04e7f3..496906bffb 100644 --- a/client/src/app/gateways/repositories/action-worker/action-worker.config.ts +++ b/client/src/app/gateways/repositories/action-worker/action-worker.config.ts @@ -1,5 +1,5 @@ -import { ActionWorker } from 'src/app/domain/models/action-worker/action-worker'; -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; +import { ActionWorker } from '@app/domain/models/action-worker/action-worker'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; import { ActionWorkerRepositoryService } from './action-worker-repository.service'; import { ViewActionWorker } from './view-action-worker'; diff --git a/client/src/app/gateways/repositories/action-worker/view-action-worker.ts b/client/src/app/gateways/repositories/action-worker/view-action-worker.ts index d3db1f3bbc..c2a66a03d6 100644 --- a/client/src/app/gateways/repositories/action-worker/view-action-worker.ts +++ b/client/src/app/gateways/repositories/action-worker/view-action-worker.ts @@ -1,5 +1,5 @@ -import { ActionWorker } from 'src/app/domain/models/action-worker/action-worker'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; +import { ActionWorker } from '@app/domain/models/action-worker/action-worker'; +import { BaseViewModel } from '@app/site/base/base-view-model'; export class ViewActionWorker extends BaseViewModel { public static COLLECTION = ActionWorker.COLLECTION; diff --git a/client/src/app/gateways/repositories/agenda/agenda-item-repository.service.ts b/client/src/app/gateways/repositories/agenda/agenda-item-repository.service.ts index d54b63d7fa..9a93fa56d3 100644 --- a/client/src/app/gateways/repositories/agenda/agenda-item-repository.service.ts +++ b/client/src/app/gateways/repositories/agenda/agenda-item-repository.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; -import { Id, Ids } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { AgendaItem, AgendaItemType } from 'src/app/domain/models/agenda/agenda-item'; -import { TreeIdNode } from 'src/app/infrastructure/definitions/tree'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { AgendaListTitle, HasAgendaItem, ViewAgendaItem } from 'src/app/site/pages/meetings/pages/agenda'; -import { TreeService } from 'src/app/ui/modules/sorting/modules/sorting-tree/services'; +import { Id, Ids } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { AgendaItem, AgendaItemType } from '@app/domain/models/agenda/agenda-item'; +import { TreeIdNode } from '@app/infrastructure/definitions/tree'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { AgendaListTitle, HasAgendaItem, ViewAgendaItem } from '@app/site/pages/meetings/pages/agenda'; +import { TreeService } from '@app/ui/modules/sorting/modules/sorting-tree/services'; import { Action } from '../../actions'; import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; diff --git a/client/src/app/gateways/repositories/assignments/assignment-candidate-repository.service/assignment-candidate-repository.service.ts b/client/src/app/gateways/repositories/assignments/assignment-candidate-repository.service/assignment-candidate-repository.service.ts index f82507a5ea..db09e2b801 100644 --- a/client/src/app/gateways/repositories/assignments/assignment-candidate-repository.service/assignment-candidate-repository.service.ts +++ b/client/src/app/gateways/repositories/assignments/assignment-candidate-repository.service/assignment-candidate-repository.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Action } from 'src/app/gateways/actions'; -import { BaseMeetingRelatedRepository } from 'src/app/gateways/repositories/base-meeting-related-repository'; -import { ViewAssignmentCandidate } from 'src/app/site/pages/meetings/pages/assignments'; -import { UnknownUserLabel } from 'src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Action } from '@app/gateways/actions'; +import { BaseMeetingRelatedRepository } from '@app/gateways/repositories/base-meeting-related-repository'; +import { ViewAssignmentCandidate } from '@app/site/pages/meetings/pages/assignments'; +import { UnknownUserLabel } from '@app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service'; import { AssignmentCandidate } from '../../../../domain/models/assignments/assignment-candidate'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/assignments/assignment-repository.service/assignment-repository.service.ts b/client/src/app/gateways/repositories/assignments/assignment-repository.service/assignment-repository.service.ts index ad888a057f..906503eede 100644 --- a/client/src/app/gateways/repositories/assignments/assignment-repository.service/assignment-repository.service.ts +++ b/client/src/app/gateways/repositories/assignments/assignment-repository.service/assignment-repository.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { AgendaItemRepositoryService } from 'src/app/gateways/repositories/agenda'; -import { ViewAssignment } from 'src/app/site/pages/meetings/pages/assignments'; -import { Fieldsets } from 'src/app/site/services/model-request-builder'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { AgendaItemRepositoryService } from '@app/gateways/repositories/agenda'; +import { ViewAssignment } from '@app/site/pages/meetings/pages/assignments'; +import { Fieldsets } from '@app/site/services/model-request-builder'; import { Assignment } from '../../../../domain/models/assignments/assignment'; import { createAgendaItem } from '../../agenda'; diff --git a/client/src/app/gateways/repositories/base-agenda-item-and-list-of-speakers-content-object-repository.ts b/client/src/app/gateways/repositories/base-agenda-item-and-list-of-speakers-content-object-repository.ts index c61949dc6e..262a45ecb5 100644 --- a/client/src/app/gateways/repositories/base-agenda-item-and-list-of-speakers-content-object-repository.ts +++ b/client/src/app/gateways/repositories/base-agenda-item-and-list-of-speakers-content-object-repository.ts @@ -1,7 +1,7 @@ -import { HasAgendaItemId, HasListOfSpeakersId } from 'src/app/domain/interfaces'; -import { BaseModel, ModelConstructor } from 'src/app/domain/models/base/base-model'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { AgendaListTitle, HasAgendaItem, HasListOfSpeakers } from 'src/app/site/pages/meetings/pages/agenda'; +import { HasAgendaItemId, HasListOfSpeakersId } from '@app/domain/interfaces'; +import { BaseModel, ModelConstructor } from '@app/domain/models/base/base-model'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { AgendaListTitle, HasAgendaItem, HasListOfSpeakers } from '@app/site/pages/meetings/pages/agenda'; import { AgendaItemRepositoryService } from './agenda/agenda-item-repository.service'; import { AgendaItemContentObjectRepository } from './base-agenda-item-content-object-repository'; diff --git a/client/src/app/gateways/repositories/base-agenda-item-content-object-repository.ts b/client/src/app/gateways/repositories/base-agenda-item-content-object-repository.ts index b91cc338bd..7286c3615b 100644 --- a/client/src/app/gateways/repositories/base-agenda-item-content-object-repository.ts +++ b/client/src/app/gateways/repositories/base-agenda-item-content-object-repository.ts @@ -1,7 +1,7 @@ -import { HasAgendaItemId } from 'src/app/domain/interfaces'; -import { BaseModel, ModelConstructor } from 'src/app/domain/models/base/base-model'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { AgendaListTitle, HasAgendaItem } from 'src/app/site/pages/meetings/pages/agenda'; +import { HasAgendaItemId } from '@app/domain/interfaces'; +import { BaseModel, ModelConstructor } from '@app/domain/models/base/base-model'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { AgendaListTitle, HasAgendaItem } from '@app/site/pages/meetings/pages/agenda'; import { AgendaItemRepositoryService } from './agenda'; import { BaseMeetingRelatedRepository } from './base-meeting-related-repository'; diff --git a/client/src/app/gateways/repositories/base-list-of-speakers-content-object-repository.ts b/client/src/app/gateways/repositories/base-list-of-speakers-content-object-repository.ts index 006fac2d89..4af1bab01b 100644 --- a/client/src/app/gateways/repositories/base-list-of-speakers-content-object-repository.ts +++ b/client/src/app/gateways/repositories/base-list-of-speakers-content-object-repository.ts @@ -1,7 +1,7 @@ -import { HasListOfSpeakersId } from 'src/app/domain/interfaces'; -import { BaseModel, ModelConstructor } from 'src/app/domain/models/base/base-model'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { HasListOfSpeakers } from 'src/app/site/pages/meetings/pages/agenda'; +import { HasListOfSpeakersId } from '@app/domain/interfaces'; +import { BaseModel, ModelConstructor } from '@app/domain/models/base/base-model'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { HasListOfSpeakers } from '@app/site/pages/meetings/pages/agenda'; import { BaseMeetingRelatedRepository } from './base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from './repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/base-meeting-related-repository.ts b/client/src/app/gateways/repositories/base-meeting-related-repository.ts index 1a75563529..321e200790 100644 --- a/client/src/app/gateways/repositories/base-meeting-related-repository.ts +++ b/client/src/app/gateways/repositories/base-meeting-related-repository.ts @@ -1,4 +1,4 @@ -import { HasMeetingId } from 'src/app/domain/interfaces'; +import { HasMeetingId } from '@app/domain/interfaces'; import { Id } from '../../domain/definitions/key-types'; import { BaseModel, ModelConstructor } from '../../domain/models/base/base-model'; diff --git a/client/src/app/gateways/repositories/base-repository.ts b/client/src/app/gateways/repositories/base-repository.ts index f1cdd37b4a..cc1a72aa87 100644 --- a/client/src/app/gateways/repositories/base-repository.ts +++ b/client/src/app/gateways/repositories/base-repository.ts @@ -1,12 +1,12 @@ +import { HasSequentialNumber, Identifiable } from '@app/domain/interfaces'; +import { OnAfterAppsLoaded } from '@app/infrastructure/definitions/hooks/after-apps-loaded'; +import { ListUpdateData } from '@app/infrastructure/utils'; +import { getIntlCollatorForLang } from '@app/infrastructure/utils'; +import { Deferred } from '@app/infrastructure/utils/promises'; +import { OsSortProperty } from '@app/site/base/base-sort.service'; +import { SortListService } from '@app/ui/modules/list'; import { TranslateService } from '@ngx-translate/core'; import { auditTime, BehaviorSubject, filter, Observable, Subject, Subscription } from 'rxjs'; -import { HasSequentialNumber, Identifiable } from 'src/app/domain/interfaces'; -import { OnAfterAppsLoaded } from 'src/app/infrastructure/definitions/hooks/after-apps-loaded'; -import { ListUpdateData } from 'src/app/infrastructure/utils'; -import { getIntlCollatorForLang } from 'src/app/infrastructure/utils'; -import { Deferred } from 'src/app/infrastructure/utils/promises'; -import { OsSortProperty } from 'src/app/site/base/base-sort.service'; -import { SortListService } from 'src/app/ui/modules/list'; import { Id } from '../../domain/definitions/key-types'; import { BaseModel, ModelConstructor } from '../../domain/models/base/base-model'; diff --git a/client/src/app/gateways/repositories/chat/chat-group-repository.service/chat-group-repository.service.ts b/client/src/app/gateways/repositories/chat/chat-group-repository.service/chat-group-repository.service.ts index ead425479c..7f8e375887 100644 --- a/client/src/app/gateways/repositories/chat/chat-group-repository.service/chat-group-repository.service.ts +++ b/client/src/app/gateways/repositories/chat/chat-group-repository.service/chat-group-repository.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ChatGroup } from 'src/app/domain/models/chat/chat-group'; -import { ViewChatGroup } from 'src/app/site/pages/meetings/pages/chat'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { ChatGroup } from '@app/domain/models/chat/chat-group'; +import { ViewChatGroup } from '@app/site/pages/meetings/pages/chat'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/chat/chat-message-repository.service/chat-message-repository.service.ts b/client/src/app/gateways/repositories/chat/chat-message-repository.service/chat-message-repository.service.ts index d12e880083..ef2e289cd1 100644 --- a/client/src/app/gateways/repositories/chat/chat-message-repository.service/chat-message-repository.service.ts +++ b/client/src/app/gateways/repositories/chat/chat-message-repository.service/chat-message-repository.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ChatMessage } from 'src/app/domain/models/chat/chat-message'; -import { ViewChatMessage } from 'src/app/site/pages/meetings/pages/chat'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { ChatMessage } from '@app/domain/models/chat/chat-message'; +import { ViewChatMessage } from '@app/site/pages/meetings/pages/chat'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/committee-repository.service.ts b/client/src/app/gateways/repositories/committee-repository.service.ts index af0fcf03b4..2d4bb60866 100644 --- a/client/src/app/gateways/repositories/committee-repository.service.ts +++ b/client/src/app/gateways/repositories/committee-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { BackendImportRawPreview } from 'src/app/ui/modules/import-list/definitions/backend-import-preview'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { BackendImportRawPreview } from '@app/ui/modules/import-list/definitions/backend-import-preview'; import { Id } from '../../domain/definitions/key-types'; import { CML, OML } from '../../domain/definitions/organization-permission'; diff --git a/client/src/app/gateways/repositories/gender/gender-repository.service.ts b/client/src/app/gateways/repositories/gender/gender-repository.service.ts index f6c4619ea5..56fa7c2127 100644 --- a/client/src/app/gateways/repositories/gender/gender-repository.service.ts +++ b/client/src/app/gateways/repositories/gender/gender-repository.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Gender } from 'src/app/domain/models/gender/gender'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { ViewGender } from 'src/app/site/pages/organization/pages/accounts/pages/gender/view-models/view-gender'; -import { Fieldsets } from 'src/app/site/services/model-request-builder'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Gender } from '@app/domain/models/gender/gender'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { ViewGender } from '@app/site/pages/organization/pages/accounts/pages/gender/view-models/view-gender'; +import { Fieldsets } from '@app/site/services/model-request-builder'; import { Action } from '../../actions'; import { RepositoryServiceCollectorService } from '../repository-service-collector.service'; diff --git a/client/src/app/gateways/repositories/groups/group-repository.service.ts b/client/src/app/gateways/repositories/groups/group-repository.service.ts index 2bc42d09ac..ec5c7f51c2 100644 --- a/client/src/app/gateways/repositories/groups/group-repository.service.ts +++ b/client/src/app/gateways/repositories/groups/group-repository.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Group } from 'src/app/domain/models/users/group'; -import { BaseMeetingRelatedRepository } from 'src/app/gateways/repositories/base-meeting-related-repository'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { Fieldsets } from 'src/app/site/services/model-request-builder'; +import { Identifiable } from '@app/domain/interfaces'; +import { Group } from '@app/domain/models/users/group'; +import { BaseMeetingRelatedRepository } from '@app/gateways/repositories/base-meeting-related-repository'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { Fieldsets } from '@app/site/services/model-request-builder'; import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; import { GroupAction } from './group.action'; diff --git a/client/src/app/gateways/repositories/history-entry/has-history-entries.ts b/client/src/app/gateways/repositories/history-entry/has-history-entries.ts index 59d5901d76..9c9a02e003 100644 --- a/client/src/app/gateways/repositories/history-entry/has-history-entries.ts +++ b/client/src/app/gateways/repositories/history-entry/has-history-entries.ts @@ -1,4 +1,4 @@ -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; import { ViewHistoryEntry } from './view-history-entry'; diff --git a/client/src/app/gateways/repositories/history-entry/history-entry-repository.service.ts b/client/src/app/gateways/repositories/history-entry/history-entry-repository.service.ts index 1d56a2f120..2fb78fb8a7 100644 --- a/client/src/app/gateways/repositories/history-entry/history-entry-repository.service.ts +++ b/client/src/app/gateways/repositories/history-entry/history-entry-repository.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { HistoryEntry } from 'src/app/domain/models/history-entry/history-entry'; +import { HistoryEntry } from '@app/domain/models/history-entry/history-entry'; import { BaseRepository } from '../base-repository'; import { RepositoryServiceCollectorService } from '../repository-service-collector.service'; diff --git a/client/src/app/gateways/repositories/history-entry/view-history-entry.ts b/client/src/app/gateways/repositories/history-entry/view-history-entry.ts index d5b7a732b4..50b6329af0 100644 --- a/client/src/app/gateways/repositories/history-entry/view-history-entry.ts +++ b/client/src/app/gateways/repositories/history-entry/view-history-entry.ts @@ -1,9 +1,9 @@ -import { HistoryEntry } from 'src/app/domain/models/history-entry/history-entry'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { ViewAssignment } from 'src/app/site/pages/meetings/pages/assignments'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; +import { HistoryEntry } from '@app/domain/models/history-entry/history-entry'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; +import { ViewAssignment } from '@app/site/pages/meetings/pages/assignments'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { ViewHistoryPosition } from '../history-position/view-history-position'; diff --git a/client/src/app/gateways/repositories/history-position/history-position-repository.service.ts b/client/src/app/gateways/repositories/history-position/history-position-repository.service.ts index f7b1d2b719..ae16152f61 100644 --- a/client/src/app/gateways/repositories/history-position/history-position-repository.service.ts +++ b/client/src/app/gateways/repositories/history-position/history-position-repository.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { HistoryPosition } from 'src/app/domain/models/history-position/history-position'; +import { HistoryPosition } from '@app/domain/models/history-position/history-position'; import { BaseRepository } from '../base-repository'; import { RepositoryServiceCollectorService } from '../repository-service-collector.service'; diff --git a/client/src/app/gateways/repositories/history-position/view-history-position.ts b/client/src/app/gateways/repositories/history-position/view-history-position.ts index 34a062d519..29901777e1 100644 --- a/client/src/app/gateways/repositories/history-position/view-history-position.ts +++ b/client/src/app/gateways/repositories/history-position/view-history-position.ts @@ -1,6 +1,6 @@ -import { HistoryPosition } from 'src/app/domain/models/history-position/history-position'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; +import { HistoryPosition } from '@app/domain/models/history-position/history-position'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { ViewHistoryEntry } from '../history-entry/view-history-entry'; diff --git a/client/src/app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service.ts b/client/src/app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service.ts index fd1ad06484..accadb47af 100644 --- a/client/src/app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service.ts +++ b/client/src/app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { ListOfSpeakers } from 'src/app/domain/models/list-of-speakers/list-of-speakers'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { hasListOfSpeakers, ViewListOfSpeakers } from 'src/app/site/pages/meetings/pages/agenda'; +import { ListOfSpeakers } from '@app/domain/models/list-of-speakers/list-of-speakers'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { hasListOfSpeakers, ViewListOfSpeakers } from '@app/site/pages/meetings/pages/agenda'; import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/mediafiles/mediafile-repository.service.ts b/client/src/app/gateways/repositories/mediafiles/mediafile-repository.service.ts index 017442ed6e..2d27a3feed 100644 --- a/client/src/app/gateways/repositories/mediafiles/mediafile-repository.service.ts +++ b/client/src/app/gateways/repositories/mediafiles/mediafile-repository.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Mediafile } from 'src/app/domain/models/mediafiles/mediafile'; -import { ViewMediafile, ViewMeetingMediafile } from 'src/app/site/pages/meetings/pages/mediafiles'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { Fieldsets } from 'src/app/site/services/model-request-builder'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Mediafile } from '@app/domain/models/mediafiles/mediafile'; +import { ViewMediafile, ViewMeetingMediafile } from '@app/site/pages/meetings/pages/mediafiles'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { Fieldsets } from '@app/site/services/model-request-builder'; import { TypedFieldset } from '../../../site/services/model-request-builder/model-request-builder.service'; import { BaseRepository } from '../base-repository'; diff --git a/client/src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service.ts b/client/src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service.ts index 2131758d6d..24435f5640 100644 --- a/client/src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service.ts +++ b/client/src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { MeetingMediafile } from 'src/app/domain/models/meeting-mediafile/meeting-mediafile'; -import { ViewMeetingMediafile } from 'src/app/site/pages/meetings/pages/mediafiles/view-models/view-meeting-mediafile'; +import { Id } from '@app/domain/definitions/key-types'; +import { MeetingMediafile } from '@app/domain/models/meeting-mediafile/meeting-mediafile'; +import { ViewMeetingMediafile } from '@app/site/pages/meetings/pages/mediafiles/view-models/view-meeting-mediafile'; import { ActiveMeetingIdService } from '../../../site/pages/meetings/services/active-meeting-id.service'; import { BaseRepository } from '../base-repository'; diff --git a/client/src/app/gateways/repositories/meeting-repository.service.ts b/client/src/app/gateways/repositories/meeting-repository.service.ts index 7a4241abfc..347ff60475 100644 --- a/client/src/app/gateways/repositories/meeting-repository.service.ts +++ b/client/src/app/gateways/repositories/meeting-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; +import { Action } from '@app/gateways/actions'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; import { getUnixTime } from 'date-fns'; -import { Action } from 'src/app/gateways/actions'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; import { Id } from '../../domain/definitions/key-types'; import { Identifiable } from '../../domain/interfaces/identifiable'; diff --git a/client/src/app/gateways/repositories/meeting_user/meeting-user-config.ts b/client/src/app/gateways/repositories/meeting_user/meeting-user-config.ts index 035b1db06c..ac6061dc76 100644 --- a/client/src/app/gateways/repositories/meeting_user/meeting-user-config.ts +++ b/client/src/app/gateways/repositories/meeting_user/meeting-user-config.ts @@ -1,6 +1,6 @@ -import { MeetingUser } from 'src/app/domain/models/meeting-users/meeting-user'; -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; -import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user'; +import { MeetingUser } from '@app/domain/models/meeting-users/meeting-user'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; +import { ViewMeetingUser } from '@app/site/pages/meetings/view-models/view-meeting-user'; import { MeetingUserRepositoryService } from './meeting-user-repository.service'; diff --git a/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts b/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts index 385287e853..c88ed6ae2d 100644 --- a/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts +++ b/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { MeetingUser } from 'src/app/domain/models/meeting-users/meeting-user'; -import { toDecimal } from 'src/app/infrastructure/utils'; -import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user'; -import { DEFAULT_FIELDSET, Fieldsets, TypedFieldset } from 'src/app/site/services/model-request-builder'; +import { Id } from '@app/domain/definitions/key-types'; +import { MeetingUser } from '@app/domain/models/meeting-users/meeting-user'; +import { toDecimal } from '@app/infrastructure/utils'; +import { ViewMeetingUser } from '@app/site/pages/meetings/view-models/view-meeting-user'; +import { DEFAULT_FIELDSET, Fieldsets, TypedFieldset } from '@app/site/services/model-request-builder'; import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/motions/motion-block-repository.service/motion-block-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-block-repository.service/motion-block-repository.service.ts index 3d8517df63..06e8d367aa 100644 --- a/client/src/app/gateways/repositories/motions/motion-block-repository.service/motion-block-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-block-repository.service/motion-block-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; +import { Identifiable } from '@app/domain/interfaces'; +import { ViewMotionBlock } from '@app/site/pages/meetings/pages/motions'; import { map, Observable } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ViewMotionBlock } from 'src/app/site/pages/meetings/pages/motions'; import { MotionBlock } from '../../../../domain/models/motions/motion-block'; import { AgendaItemRepositoryService, createAgendaItem } from '../../agenda'; diff --git a/client/src/app/gateways/repositories/motions/motion-category-repository.service/motion-category-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-category-repository.service/motion-category-repository.service.ts index b27c0d633e..200c7b7626 100644 --- a/client/src/app/gateways/repositories/motions/motion-category-repository.service/motion-category-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-category-repository.service/motion-category-repository.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionCategory } from '@app/domain/models/motions/motion-category'; +import { Action } from '@app/gateways/actions'; +import { TreeIdNode } from '@app/infrastructure/definitions/tree'; +import { ViewMotionCategory } from '@app/site/pages/meetings/pages/motions'; +import { Fieldsets } from '@app/site/services/model-request-builder'; import { map, Observable } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionCategory } from 'src/app/domain/models/motions/motion-category'; -import { Action } from 'src/app/gateways/actions'; -import { TreeIdNode } from 'src/app/infrastructure/definitions/tree'; -import { ViewMotionCategory } from 'src/app/site/pages/meetings/pages/motions'; -import { Fieldsets } from 'src/app/site/services/model-request-builder'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/motions/motion-change-recommendation-repository.service/motion-change-recommendation-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-change-recommendation-repository.service/motion-change-recommendation-repository.service.ts index a2abaffd58..3bb8fa058d 100644 --- a/client/src/app/gateways/repositories/motions/motion-change-recommendation-repository.service/motion-change-recommendation-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-change-recommendation-repository.service/motion-change-recommendation-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionChangeRecommendation } from 'src/app/domain/models/motions/motion-change-recommendation'; -import { ViewMotionChangeRecommendation } from 'src/app/site/pages/meetings/pages/motions'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionChangeRecommendation } from '@app/domain/models/motions/motion-change-recommendation'; +import { ViewMotionChangeRecommendation } from '@app/site/pages/meetings/pages/motions'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-repository.service.ts index b6ff9846e6..cdc69f519d 100644 --- a/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionComment } from 'src/app/domain/models/motions/motion-comment'; -import { ViewMotionComment } from 'src/app/site/pages/meetings/pages/motions'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionComment } from '@app/domain/models/motions/motion-comment'; +import { ViewMotionComment } from '@app/site/pages/meetings/pages/motions'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-section-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-section-repository.service.ts index ec1daec495..116cf68568 100644 --- a/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-section-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-section-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionCommentSection } from 'src/app/domain/models/motions/motion-comment-section'; -import { ViewMotionCommentSection } from 'src/app/site/pages/meetings/pages/motions'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionCommentSection } from '@app/domain/models/motions/motion-comment-section'; +import { ViewMotionCommentSection } from '@app/site/pages/meetings/pages/motions'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/motions/motion-editor-repository/motion-editor-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-editor-repository/motion-editor-repository.service.ts index db10c4ac63..2788dc8c46 100644 --- a/client/src/app/gateways/repositories/motions/motion-editor-repository/motion-editor-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-editor-repository/motion-editor-repository.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { MotionEditor } from 'src/app/domain/models/motions/motion-editor'; +import { MotionEditor } from '@app/domain/models/motions/motion-editor'; import { ViewMotionEditor } from '../../../../site/pages/meetings/pages/motions/modules/editors/view-models/view-motion-editor'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.ts index 2cffc4534b..1b79d7a4c8 100644 --- a/client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.ts @@ -1,15 +1,15 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Action } from '@app/gateways/actions'; +import { TreeIdNode } from '@app/infrastructure/definitions/tree'; +import { NullablePartial } from '@app/infrastructure/utils'; +import { AgendaListTitle } from '@app/site/pages/meetings/pages/agenda'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { MotionFormatResult } from '@app/site/pages/meetings/pages/motions/services/common/motion-format.service'; +import { TreeService } from '@app/ui/modules/sorting/modules/sorting-tree/services'; import { VERSION as CURRENT_DIFF_VERSION } from '@openslides/motion-diff'; import { map, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Action } from 'src/app/gateways/actions'; -import { TreeIdNode } from 'src/app/infrastructure/definitions/tree'; -import { NullablePartial } from 'src/app/infrastructure/utils'; -import { AgendaListTitle } from 'src/app/site/pages/meetings/pages/agenda'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { MotionFormatResult } from 'src/app/site/pages/meetings/pages/motions/services/common/motion-format.service'; -import { TreeService } from 'src/app/ui/modules/sorting/modules/sorting-tree/services'; import { Motion } from '../../../../domain/models/motions/motion'; import { AgendaItemRepositoryService, createAgendaItem } from '../../agenda'; diff --git a/client/src/app/gateways/repositories/motions/motion-state-repository.service/motion-state-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-state-repository.service/motion-state-repository.service.ts index c926228f64..060415f0c7 100644 --- a/client/src/app/gateways/repositories/motions/motion-state-repository.service/motion-state-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-state-repository.service/motion-state-repository.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionState } from '@app/domain/models/motions/motion-state'; +import { Action } from '@app/gateways/actions'; +import { ViewMotionState } from '@app/site/pages/meetings/pages/motions'; import { map, Observable } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionState } from 'src/app/domain/models/motions/motion-state'; -import { Action } from 'src/app/gateways/actions'; -import { ViewMotionState } from 'src/app/site/pages/meetings/pages/motions'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/motions/motion-submitter-repository.service/motion-submitter-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-submitter-repository.service/motion-submitter-repository.service.ts index 8c1bdfc6f2..fc4b0078b5 100644 --- a/client/src/app/gateways/repositories/motions/motion-submitter-repository.service/motion-submitter-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-submitter-repository.service/motion-submitter-repository.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { MotionSubmitter } from 'src/app/domain/models/motions/motion-submitter'; +import { MotionSubmitter } from '@app/domain/models/motions/motion-submitter'; import { ViewMotionSubmitter } from '../../../../site/pages/meetings/pages/motions/modules/submitters/view-models/view-motion-submitter'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/motions/motion-supporter/motion-supporter-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-supporter/motion-supporter-repository.service.ts index e7845bd1a0..6790698154 100644 --- a/client/src/app/gateways/repositories/motions/motion-supporter/motion-supporter-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-supporter/motion-supporter-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionSupporter } from 'src/app/domain/models/motions/motion-supporter'; -import { Action } from 'src/app/gateways/actions'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionSupporter } from '@app/domain/models/motions/motion-supporter'; +import { Action } from '@app/gateways/actions'; import { ViewMotionSupporter } from '../../../../site/pages/meetings/pages/motions/modules/supporters/view-models/view-motion-supporter'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; diff --git a/client/src/app/gateways/repositories/motions/motion-workflow-repository.service/motion-workflow-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-workflow-repository.service/motion-workflow-repository.service.ts index 4f31e30a76..893112956f 100644 --- a/client/src/app/gateways/repositories/motions/motion-workflow-repository.service/motion-workflow-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-workflow-repository.service/motion-workflow-repository.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionWorkflow } from 'src/app/domain/models/motions/motion-workflow'; -import { Action } from 'src/app/gateways/actions'; -import { ViewMotionWorkflow } from 'src/app/site/pages/meetings/pages/motions'; -import { Fieldsets, ROUTING_FIELDSET } from 'src/app/site/services/model-request-builder'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionWorkflow } from '@app/domain/models/motions/motion-workflow'; +import { Action } from '@app/gateways/actions'; +import { ViewMotionWorkflow } from '@app/site/pages/meetings/pages/motions'; +import { Fieldsets, ROUTING_FIELDSET } from '@app/site/services/model-request-builder'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/motions/motion-working-group-speaker-repository/motion-working-group-speaker-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-working-group-speaker-repository/motion-working-group-speaker-repository.service.ts index 86693cc4c5..06c1e8cec5 100644 --- a/client/src/app/gateways/repositories/motions/motion-working-group-speaker-repository/motion-working-group-speaker-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-working-group-speaker-repository/motion-working-group-speaker-repository.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { MotionWorkingGroupSpeaker } from 'src/app/domain/models/motions/motion-working-group-speaker'; +import { MotionWorkingGroupSpeaker } from '@app/domain/models/motions/motion-working-group-speaker'; import { ViewMotionWorkingGroupSpeaker } from '../../../../site/pages/meetings/pages/motions/modules/working-group-speakers/view-models/view-motion-working-group-speaker'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/motions/personal-note-repository.service/personal-note-repository.service.ts b/client/src/app/gateways/repositories/motions/personal-note-repository.service/personal-note-repository.service.ts index 8c31cd76a3..d100fadf13 100644 --- a/client/src/app/gateways/repositories/motions/personal-note-repository.service/personal-note-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/personal-note-repository.service/personal-note-repository.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { Fqid } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { PersonalNote } from 'src/app/domain/models/motions/personal-note'; -import { Action } from 'src/app/gateways/actions'; -import { BaseMeetingRelatedRepository } from 'src/app/gateways/repositories/base-meeting-related-repository'; -import { ViewPersonalNote } from 'src/app/site/pages/meetings/pages/motions'; +import { Fqid } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { PersonalNote } from '@app/domain/models/motions/personal-note'; +import { Action } from '@app/gateways/actions'; +import { BaseMeetingRelatedRepository } from '@app/gateways/repositories/base-meeting-related-repository'; +import { ViewPersonalNote } from '@app/site/pages/meetings/pages/motions'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { PersonalNoteAction } from './personal-note.action'; diff --git a/client/src/app/gateways/repositories/motions/util.ts b/client/src/app/gateways/repositories/motions/util.ts index 4f2434e396..703f3012df 100644 --- a/client/src/app/gateways/repositories/motions/util.ts +++ b/client/src/app/gateways/repositories/motions/util.ts @@ -1,7 +1,7 @@ -import { Identifiable } from 'src/app/domain/interfaces'; -import { BaseModel, ModelConstructor } from 'src/app/domain/models/base/base-model'; -import { Action } from 'src/app/gateways/actions'; -import { BaseHasMeetingUserViewModel } from 'src/app/site/pages/meetings/base/base-has-meeting-user-view-model'; +import { Identifiable } from '@app/domain/interfaces'; +import { BaseModel, ModelConstructor } from '@app/domain/models/base/base-model'; +import { Action } from '@app/gateways/actions'; +import { BaseHasMeetingUserViewModel } from '@app/site/pages/meetings/base/base-has-meeting-user-view-model'; import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/organization-repository.service.ts b/client/src/app/gateways/repositories/organization-repository.service.ts index 8265d11435..47317ba7ad 100644 --- a/client/src/app/gateways/repositories/organization-repository.service.ts +++ b/client/src/app/gateways/repositories/organization-repository.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; import { Organization, OrganizationAction, OrganizationSetting } from '../../domain/models/organizations/organization'; import { ViewOrganization } from '../../site/pages/organization/view-models/view-organization'; diff --git a/client/src/app/gateways/repositories/organization-tags/organization-tag-repository.service.ts b/client/src/app/gateways/repositories/organization-tags/organization-tag-repository.service.ts index 7d4a654308..4b4e7ee3f9 100644 --- a/client/src/app/gateways/repositories/organization-tags/organization-tag-repository.service.ts +++ b/client/src/app/gateways/repositories/organization-tags/organization-tag-repository.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; import { Identifiable } from '../../../domain/interfaces'; import { OrganizationTag } from '../../../domain/models/organization-tags/organization-tag'; diff --git a/client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.ts b/client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.ts index b2fd72775d..6ed382a8e5 100644 --- a/client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.ts +++ b/client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { PointOfOrderCategory } from 'src/app/domain/models/point-of-order-category/point-of-order-category'; -import { ListUpdateData } from 'src/app/infrastructure/utils'; -import { ViewPointOfOrderCategory } from 'src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-point-of-order-category'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { PointOfOrderCategory } from '@app/domain/models/point-of-order-category/point-of-order-category'; +import { ListUpdateData } from '@app/infrastructure/utils'; +import { ViewPointOfOrderCategory } from '@app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-point-of-order-category'; import { Action } from '../../actions'; import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; diff --git a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts index f3a59a1e0b..fbb108788e 100644 --- a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts +++ b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; +import { PollCandidateList } from '@app/domain/models/poll-candidate-lists/poll-candidate-list'; +import { ViewPollCandidateList } from '@app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list'; +import { DEFAULT_FIELDSET, Fieldsets } from '@app/site/services/model-request-builder'; 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'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.ts b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.ts index 579f392f30..3d455e15c4 100644 --- a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.ts +++ b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { PollCandidate } from 'src/app/domain/models/poll-candidate-lists/poll-candidate'; -import { ViewPollCandidate } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate'; -import { DEFAULT_FIELDSET, Fieldsets } from 'src/app/site/services/model-request-builder'; +import { PollCandidate } from '@app/domain/models/poll-candidate-lists/poll-candidate'; +import { ViewPollCandidate } from '@app/site/pages/meetings/pages/polls/view-models/view-poll-candidate'; +import { DEFAULT_FIELDSET, Fieldsets } from '@app/site/services/model-request-builder'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.ts b/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.ts index 43af9f79f1..52f14ce260 100644 --- a/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.ts +++ b/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Option } from 'src/app/domain/models/poll/option'; -import { ViewOption } from 'src/app/site/pages/meetings/pages/polls'; +import { Option } from '@app/domain/models/poll/option'; +import { ViewOption } from '@app/site/pages/meetings/pages/polls'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts b/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts index cdb4406494..9941a176d6 100644 --- a/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts +++ b/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; -import { Decimal } from 'src/app/domain/definitions/key-types'; -import { Poll } from 'src/app/domain/models/poll/poll'; -import { PollState, PollType } from 'src/app/domain/models/poll/poll-constants'; -import { toDecimal } from 'src/app/infrastructure/utils'; -import { VoteControllerService } from 'src/app/site/pages/meetings/modules/poll/services/vote-controller.service'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; -import { Fieldsets } from 'src/app/site/services/model-request-builder'; +import { Decimal } from '@app/domain/definitions/key-types'; +import { Poll } from '@app/domain/models/poll/poll'; +import { PollState, PollType } from '@app/domain/models/poll/poll-constants'; +import { toDecimal } from '@app/infrastructure/utils'; +import { VoteControllerService } from '@app/site/pages/meetings/modules/poll/services/vote-controller.service'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; +import { Fieldsets } from '@app/site/services/model-request-builder'; import { Identifiable } from '../../../../domain/interfaces/identifiable'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; diff --git a/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.ts b/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.ts index e78cc4f13b..a04e60aee5 100644 --- a/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.ts +++ b/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Vote } from '@app/domain/models/poll/vote'; +import { HttpService } from '@app/gateways/http.service'; +import { ViewPoll, ViewVote } from '@app/site/pages/meetings/pages/polls'; +import { OperatorService } from '@app/site/services/operator.service'; import { BehaviorSubject } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Vote } from 'src/app/domain/models/poll/vote'; -import { HttpService } from 'src/app/gateways/http.service'; -import { ViewPoll, ViewVote } from 'src/app/site/pages/meetings/pages/polls'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/projections/projection-repository.service.ts b/client/src/app/gateways/repositories/projections/projection-repository.service.ts index bfb409a9f6..cb15a5d6c0 100644 --- a/client/src/app/gateways/repositories/projections/projection-repository.service.ts +++ b/client/src/app/gateways/repositories/projections/projection-repository.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Projection } from 'src/app/domain/models/projector/projection'; -import { ViewProjection } from 'src/app/site/pages/meetings/pages/projectors'; -import { Fieldsets } from 'src/app/site/services/model-request-builder'; +import { Identifiable } from '@app/domain/interfaces'; +import { Projection } from '@app/domain/models/projector/projection'; +import { ViewProjection } from '@app/site/pages/meetings/pages/projectors'; +import { Fieldsets } from '@app/site/services/model-request-builder'; import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service.ts b/client/src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service.ts index ccf12193ca..87a8563b0e 100644 --- a/client/src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service.ts +++ b/client/src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ProjectorCountdown } from 'src/app/domain/models/projector/projector-countdown'; -import { ViewProjectorCountdown } from 'src/app/site/pages/meetings/pages/projectors'; +import { Identifiable } from '@app/domain/interfaces'; +import { ProjectorCountdown } from '@app/domain/models/projector/projector-countdown'; +import { ViewProjectorCountdown } from '@app/site/pages/meetings/pages/projectors'; import { ServerTimeService } from '../../server-time.service'; import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; diff --git a/client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.ts b/client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.ts index 228bb3e633..ea63bcb183 100644 --- a/client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.ts +++ b/client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ProjectorMessage } from 'src/app/domain/models/projector/projector-message'; -import { ViewProjectorMessage } from 'src/app/site/pages/meetings/pages/projectors'; +import { Identifiable } from '@app/domain/interfaces'; +import { ProjectorMessage } from '@app/domain/models/projector/projector-message'; +import { ViewProjectorMessage } from '@app/site/pages/meetings/pages/projectors'; import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/projectors/projector-repository.service.ts b/client/src/app/gateways/repositories/projectors/projector-repository.service.ts index f31d73de96..a97e418e27 100644 --- a/client/src/app/gateways/repositories/projectors/projector-repository.service.ts +++ b/client/src/app/gateways/repositories/projectors/projector-repository.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Projector } from '@app/domain/models/projector/projector'; +import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; +import { ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models/projection-build-descriptor'; import { map, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Projector } from 'src/app/domain/models/projector/projector'; -import { ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; -import { ProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models/projection-build-descriptor'; import { Action } from '../../actions'; import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; diff --git a/client/src/app/gateways/repositories/repository-meeting-service-collector.service.spec.ts b/client/src/app/gateways/repositories/repository-meeting-service-collector.service.spec.ts index d6af6e7f95..873a138f8f 100644 --- a/client/src/app/gateways/repositories/repository-meeting-service-collector.service.spec.ts +++ b/client/src/app/gateways/repositories/repository-meeting-service-collector.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { CollectionMapperService } from '@app/site/services/collection-mapper.service'; +import { DataStoreService } from '@app/site/services/data-store.service'; +import { RelationManagerService } from '@app/site/services/relation-manager.service'; +import { ViewModelStoreService } from '@app/site/services/view-model-store.service'; import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom, skip } from 'rxjs'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { CollectionMapperService } from 'src/app/site/services/collection-mapper.service'; -import { DataStoreService } from 'src/app/site/services/data-store.service'; -import { RelationManagerService } from 'src/app/site/services/relation-manager.service'; -import { ViewModelStoreService } from 'src/app/site/services/view-model-store.service'; import { ActionService } from '../actions'; import { RepositoryMeetingServiceCollectorService } from './repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/speakers/speaker-repository.service.ts b/client/src/app/gateways/repositories/speakers/speaker-repository.service.ts index 68f090b43f..7cca422d49 100644 --- a/client/src/app/gateways/repositories/speakers/speaker-repository.service.ts +++ b/client/src/app/gateways/repositories/speakers/speaker-repository.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { Id, UnsafeHtml } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ListOfSpeakers } from 'src/app/domain/models/list-of-speakers/list-of-speakers'; -import { Speaker } from 'src/app/domain/models/speakers/speaker'; -import { SpeechState } from 'src/app/domain/models/speakers/speech-state'; -import { ViewSpeaker } from 'src/app/site/pages/meetings/pages/agenda'; +import { Id, UnsafeHtml } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { ListOfSpeakers } from '@app/domain/models/list-of-speakers/list-of-speakers'; +import { Speaker } from '@app/domain/models/speakers/speaker'; +import { SpeechState } from '@app/domain/models/speakers/speech-state'; +import { ViewSpeaker } from '@app/site/pages/meetings/pages/agenda'; import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers-repository.service.ts b/client/src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers-repository.service.ts index f227d45ce8..7d28e332d4 100644 --- a/client/src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers-repository.service.ts +++ b/client/src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers-repository.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { StructureLevelListOfSpeakers } from 'src/app/domain/models/structure-levels/structure-level-list-of-speakers'; -import { StructureLevelListOfSpeakersAction } from 'src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers.action'; -import { ViewStructureLevelListOfSpeakers } from 'src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; +import { Identifiable } from '@app/domain/interfaces'; +import { StructureLevelListOfSpeakers } from '@app/domain/models/structure-levels/structure-level-list-of-speakers'; +import { StructureLevelListOfSpeakersAction } from '@app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers.action'; +import { ViewStructureLevelListOfSpeakers } from '@app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.ts b/client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.ts index 52af59d5c5..b39106f190 100644 --- a/client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.ts +++ b/client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; import { _ } from '@ngx-translate/core'; -import { Id } from 'src/app/domain/definitions/key-types'; import { Identifiable } from '../../../domain/interfaces'; import { StructureLevel } from '../../../domain/models/structure-levels/structure-level'; diff --git a/client/src/app/gateways/repositories/tags/tag-repository.service.ts b/client/src/app/gateways/repositories/tags/tag-repository.service.ts index 87d9f4e105..c8165e1ca7 100644 --- a/client/src/app/gateways/repositories/tags/tag-repository.service.ts +++ b/client/src/app/gateways/repositories/tags/tag-repository.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Tag } from 'src/app/domain/models/tag/tag'; -import { ViewTag } from 'src/app/site/pages/meetings/pages/motions'; +import { Identifiable } from '@app/domain/interfaces'; +import { Tag } from '@app/domain/models/tag/tag'; +import { ViewTag } from '@app/site/pages/meetings/pages/motions'; import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; diff --git a/client/src/app/gateways/repositories/themes/theme-repository.service.ts b/client/src/app/gateways/repositories/themes/theme-repository.service.ts index 4f72d54b69..1ced0f7ff8 100644 --- a/client/src/app/gateways/repositories/themes/theme-repository.service.ts +++ b/client/src/app/gateways/repositories/themes/theme-repository.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Theme } from 'src/app/domain/models/theme/theme'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { ViewTheme } from 'src/app/site/pages/organization/pages/designs'; -import { Fieldsets } from 'src/app/site/services/model-request-builder'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Theme } from '@app/domain/models/theme/theme'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { ViewTheme } from '@app/site/pages/organization/pages/designs'; +import { Fieldsets } from '@app/site/services/model-request-builder'; import { RepositoryServiceCollectorService } from '../repository-service-collector.service'; import { ThemeAction } from './theme.action'; diff --git a/client/src/app/gateways/repositories/topics/topic-repository.service.ts b/client/src/app/gateways/repositories/topics/topic-repository.service.ts index bea8822cc3..5bcb8a3a1b 100644 --- a/client/src/app/gateways/repositories/topics/topic-repository.service.ts +++ b/client/src/app/gateways/repositories/topics/topic-repository.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Topic } from 'src/app/domain/models/topics/topic'; -import { ViewAgendaItem, ViewTopic } from 'src/app/site/pages/meetings/pages/agenda'; -import { BackendImportRawPreview } from 'src/app/ui/modules/import-list/definitions/backend-import-preview'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Topic } from '@app/domain/models/topics/topic'; +import { ViewAgendaItem, ViewTopic } from '@app/site/pages/meetings/pages/agenda'; +import { BackendImportRawPreview } from '@app/ui/modules/import-list/definitions/backend-import-preview'; import { Action } from '../../actions'; import { createAgendaItem } from '../agenda'; diff --git a/client/src/app/gateways/repositories/users/user-repository.service.ts b/client/src/app/gateways/repositories/users/user-repository.service.ts index 7e99baad24..a2a2d9e0b8 100644 --- a/client/src/app/gateways/repositories/users/user-repository.service.ts +++ b/client/src/app/gateways/repositories/users/user-repository.service.ts @@ -1,13 +1,13 @@ import { inject, Injectable } from '@angular/core'; -import { Fqid } from 'src/app/domain/definitions/key-types'; -import { MeetingUser } from 'src/app/domain/models/meeting-users/meeting-user'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { UserAction } from 'src/app/gateways/repositories/users/user-action'; -import { ViewStructureLevel } from 'src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user'; -import { BackendImportRawPreview } from 'src/app/ui/modules/import-list/definitions/backend-import-preview'; +import { Fqid } from '@app/domain/definitions/key-types'; +import { MeetingUser } from '@app/domain/models/meeting-users/meeting-user'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { UserAction } from '@app/gateways/repositories/users/user-action'; +import { ViewStructureLevel } from '@app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ViewMeetingUser } from '@app/site/pages/meetings/view-models/view-meeting-user'; +import { BackendImportRawPreview } from '@app/ui/modules/import-list/definitions/backend-import-preview'; import { Id } from '../../../domain/definitions/key-types'; import { Displayable } from '../../../domain/interfaces/displayable'; diff --git a/client/src/app/gateways/server-time.service.spec.ts b/client/src/app/gateways/server-time.service.spec.ts index 30db61d369..b85a58527a 100644 --- a/client/src/app/gateways/server-time.service.spec.ts +++ b/client/src/app/gateways/server-time.service.spec.ts @@ -1,8 +1,8 @@ import { EventEmitter } from '@angular/core'; import { TestBed } from '@angular/core/testing'; +import { LifecycleService } from '@app/site/services/lifecycle.service'; import fetchMock from 'fetch-mock'; import { firstValueFrom, lastValueFrom, skip, take } from 'rxjs'; -import { LifecycleService } from 'src/app/site/services/lifecycle.service'; import { ServerTimeService } from './server-time.service'; diff --git a/client/src/app/gateways/server-time.service.ts b/client/src/app/gateways/server-time.service.ts index c4ae47826d..397723e85e 100644 --- a/client/src/app/gateways/server-time.service.ts +++ b/client/src/app/gateways/server-time.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; +import { LifecycleService } from '@app/site/services/lifecycle.service'; import { BehaviorSubject, Observable } from 'rxjs'; -import { LifecycleService } from 'src/app/site/services/lifecycle.service'; @Injectable({ providedIn: `root` diff --git a/client/src/app/infrastructure/annotations/data-transaction.ts b/client/src/app/infrastructure/annotations/data-transaction.ts index d9ebe1aa27..b764fb1f0b 100644 --- a/client/src/app/infrastructure/annotations/data-transaction.ts +++ b/client/src/app/infrastructure/annotations/data-transaction.ts @@ -1,4 +1,4 @@ -import { Constructable } from 'src/app/domain/interfaces/constructable'; +import { Constructable } from '@app/domain/interfaces/constructable'; import { DataType } from './data-type'; diff --git a/client/src/app/infrastructure/definitions/app-config.ts b/client/src/app/infrastructure/definitions/app-config.ts index 4e3368fc93..04e5fa8069 100644 --- a/client/src/app/infrastructure/definitions/app-config.ts +++ b/client/src/app/infrastructure/definitions/app-config.ts @@ -1,8 +1,8 @@ import { Type } from '@angular/core'; -import { BaseModel, ModelConstructor } from 'src/app/domain/models/base/base-model'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { BaseViewModel, ViewModelConstructor } from 'src/app/site/base/base-view-model'; -import { MainMenuEntry } from 'src/app/site/pages/meetings/services/main-menu.service'; +import { BaseModel, ModelConstructor } from '@app/domain/models/base/base-model'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { BaseViewModel, ViewModelConstructor } from '@app/site/base/base-view-model'; +import { MainMenuEntry } from '@app/site/pages/meetings/services/main-menu.service'; interface BaseModelEntry { repository: Type>; diff --git a/client/src/app/infrastructure/definitions/relations/relations.ts b/client/src/app/infrastructure/definitions/relations/relations.ts index a0ddcaf9ef..b46158ad15 100644 --- a/client/src/app/infrastructure/definitions/relations/relations.ts +++ b/client/src/app/infrastructure/definitions/relations/relations.ts @@ -2,30 +2,30 @@ import { FONT_PLACES, LOGO_PLACES, ViewMediafileMeetingUsageKey -} from 'src/app/domain/models/mediafiles/mediafile.constants'; +} from '@app/domain/models/mediafiles/mediafile.constants'; import { MeetingDefaultProjectorIdsKey, ViewMeetingDefaultProjectorsKey, ViewMeetingMediafileUsageKey -} from 'src/app/domain/models/meetings/meeting.constants'; -import { PROJECTIONDEFAULTS } from 'src/app/domain/models/projector/projection-default'; -import { ViewProjectorMeetingUsageKey } from 'src/app/domain/models/projector/projector.constants'; -import { ViewHistoryEntry } from 'src/app/gateways/repositories/history-entry/view-history-entry'; -import { ViewHistoryPosition } from 'src/app/gateways/repositories/history-position/view-history-position'; -import { ViewPointOfOrderCategory } from 'src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-point-of-order-category'; -import { ViewMeetingMediafile } from 'src/app/site/pages/meetings/pages/mediafiles/view-models/view-meeting-mediafile'; -import { ViewMotionEditor } from 'src/app/site/pages/meetings/pages/motions/modules/editors'; -import { ViewMotionSupporter } from 'src/app/site/pages/meetings/pages/motions/modules/supporters/view-models/view-motion-supporter'; -import { ViewMotionWorkingGroupSpeaker } from 'src/app/site/pages/meetings/pages/motions/modules/working-group-speakers'; +} from '@app/domain/models/meetings/meeting.constants'; +import { PROJECTIONDEFAULTS } from '@app/domain/models/projector/projection-default'; +import { ViewProjectorMeetingUsageKey } from '@app/domain/models/projector/projector.constants'; +import { ViewHistoryEntry } from '@app/gateways/repositories/history-entry/view-history-entry'; +import { ViewHistoryPosition } from '@app/gateways/repositories/history-position/view-history-position'; +import { ViewPointOfOrderCategory } from '@app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-point-of-order-category'; +import { ViewMeetingMediafile } from '@app/site/pages/meetings/pages/mediafiles/view-models/view-meeting-mediafile'; +import { ViewMotionEditor } from '@app/site/pages/meetings/pages/motions/modules/editors'; +import { ViewMotionSupporter } from '@app/site/pages/meetings/pages/motions/modules/supporters/view-models/view-motion-supporter'; +import { ViewMotionWorkingGroupSpeaker } from '@app/site/pages/meetings/pages/motions/modules/working-group-speakers'; import { ViewStructureLevel, ViewStructureLevelListOfSpeakers -} from 'src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; -import { ViewPollCandidate } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate'; -import { ViewPollCandidateList } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list'; -import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user'; -import { ViewGender } from 'src/app/site/pages/organization/pages/accounts/pages/gender/view-models/view-gender'; -import { ViewResource } from 'src/app/site/pages/organization/pages/resources'; +} from '@app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; +import { ViewPollCandidate } from '@app/site/pages/meetings/pages/polls/view-models/view-poll-candidate'; +import { ViewPollCandidateList } from '@app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list'; +import { ViewMeetingUser } from '@app/site/pages/meetings/view-models/view-meeting-user'; +import { ViewGender } from '@app/site/pages/organization/pages/accounts/pages/gender/view-models/view-gender'; +import { ViewResource } from '@app/site/pages/organization/pages/resources'; import { BaseViewModel, ViewModelConstructor } from '../../../site/base/base-view-model'; import { diff --git a/client/src/app/infrastructure/utils/functions.spec.ts b/client/src/app/infrastructure/utils/functions.spec.ts index 1847a4238d..2b656797d3 100644 --- a/client/src/app/infrastructure/utils/functions.spec.ts +++ b/client/src/app/infrastructure/utils/functions.spec.ts @@ -1,4 +1,4 @@ -import { Identifiable } from 'src/app/domain/interfaces'; +import { Identifiable } from '@app/domain/interfaces'; import { compareNumber, diff --git a/client/src/app/infrastructure/utils/functions.ts b/client/src/app/infrastructure/utils/functions.ts index 33520e5168..ba6bd6ed37 100644 --- a/client/src/app/infrastructure/utils/functions.ts +++ b/client/src/app/infrastructure/utils/functions.ts @@ -1,6 +1,6 @@ -import { Identifiable } from 'src/app/domain/interfaces'; -import { BaseModel } from 'src/app/domain/models/base/base-model'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; +import { Identifiable } from '@app/domain/interfaces'; +import { BaseModel } from '@app/domain/models/base/base-model'; +import { BaseViewModel } from '@app/site/base/base-view-model'; import { Decimal, Id } from '../../domain/definitions/key-types'; diff --git a/client/src/app/infrastructure/utils/import/import-model.ts b/client/src/app/infrastructure/utils/import/import-model.ts index 180f83203e..7eb8a8be28 100644 --- a/client/src/app/infrastructure/utils/import/import-model.ts +++ b/client/src/app/infrastructure/utils/import/import-model.ts @@ -1,4 +1,4 @@ -import { Identifiable } from 'src/app/domain/interfaces'; +import { Identifiable } from '@app/domain/interfaces'; import { CsvImportStatus } from './import-utils'; diff --git a/client/src/app/infrastructure/utils/import/import-repository.ts b/client/src/app/infrastructure/utils/import/import-repository.ts index 330c9419b9..f29f008e27 100644 --- a/client/src/app/infrastructure/utils/import/import-repository.ts +++ b/client/src/app/infrastructure/utils/import/import-repository.ts @@ -1,4 +1,4 @@ -import { Identifiable } from 'src/app/domain/interfaces'; +import { Identifiable } from '@app/domain/interfaces'; export interface ImportRepository { create(...entries: T[]): Promise; diff --git a/client/src/app/infrastructure/utils/import/import-utils.ts b/client/src/app/infrastructure/utils/import/import-utils.ts index e20e21baba..d588bd831f 100644 --- a/client/src/app/infrastructure/utils/import/import-utils.ts +++ b/client/src/app/infrastructure/utils/import/import-utils.ts @@ -1,4 +1,4 @@ -import { Identifiable } from 'src/app/domain/interfaces'; +import { Identifiable } from '@app/domain/interfaces'; import { Id } from '../../../domain/definitions/key-types'; import { SharedImportContext } from './import-context'; diff --git a/client/src/app/infrastructure/utils/import/json-import-file-utils.ts b/client/src/app/infrastructure/utils/import/json-import-file-utils.ts index c8cea3cc84..d6d3fe8e11 100644 --- a/client/src/app/infrastructure/utils/import/json-import-file-utils.ts +++ b/client/src/app/infrastructure/utils/import/json-import-file-utils.ts @@ -1,8 +1,8 @@ import { inject, Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { FileData } from '@app/ui/modules/file-upload/components/file-upload/file-upload.component'; 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'; export const WRONG_JSON_IMPORT_FORMAT_ERROR_MSG = _(`Import data needs to have the JSON format`); diff --git a/client/src/app/infrastructure/utils/import/static-before-import-config.ts b/client/src/app/infrastructure/utils/import/static-before-import-config.ts index 5196e6caf0..3d9682c29b 100644 --- a/client/src/app/infrastructure/utils/import/static-before-import-config.ts +++ b/client/src/app/infrastructure/utils/import/static-before-import-config.ts @@ -1,5 +1,5 @@ +import { Ids } from '@app/domain/definitions/key-types'; import { Observable } from 'rxjs'; -import { Ids } from 'src/app/domain/definitions/key-types'; import { SideImportHandlerConfig } from './side-import-handler-config'; diff --git a/client/src/app/infrastructure/utils/import/static-before-import-handler.ts b/client/src/app/infrastructure/utils/import/static-before-import-handler.ts index ccdaed7f93..9d1655e887 100644 --- a/client/src/app/infrastructure/utils/import/static-before-import-handler.ts +++ b/client/src/app/infrastructure/utils/import/static-before-import-handler.ts @@ -1,4 +1,4 @@ -import { Ids } from 'src/app/domain/definitions/key-types'; +import { Ids } from '@app/domain/definitions/key-types'; import { Id } from '../../../domain/definitions/key-types'; import { isEmpty } from '../functions'; diff --git a/client/src/app/infrastructure/utils/import/users/user-import-helper.ts b/client/src/app/infrastructure/utils/import/users/user-import-helper.ts index 83d94b1e5f..f716aebabd 100644 --- a/client/src/app/infrastructure/utils/import/users/user-import-helper.ts +++ b/client/src/app/infrastructure/utils/import/users/user-import-helper.ts @@ -1,8 +1,8 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { User } from 'src/app/domain/models/users/user'; -import { ImportModel } from 'src/app/infrastructure/utils/import/import-model'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { CreateUserNameInformation } from 'src/app/site/services/user-controller.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { User } from '@app/domain/models/users/user'; +import { ImportModel } from '@app/infrastructure/utils/import/import-model'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { CreateUserNameInformation } from '@app/site/services/user-controller.service'; import { BaseBeforeImportHandler } from '../base-before-import-handler'; import { BeforeFindAction, CsvMapping, ImportResolveInformation } from '../import-utils'; diff --git a/client/src/app/infrastructure/utils/subscription-map.spec.ts b/client/src/app/infrastructure/utils/subscription-map.spec.ts index 9850d86455..3f11d6024e 100644 --- a/client/src/app/infrastructure/utils/subscription-map.spec.ts +++ b/client/src/app/infrastructure/utils/subscription-map.spec.ts @@ -1,5 +1,5 @@ +import { SubscriptionMap } from '@app/infrastructure/utils/subscription-map'; import { Observable, Subscription } from 'rxjs'; -import { SubscriptionMap } from 'src/app/infrastructure/utils/subscription-map'; describe(`utils: subscription-map`, () => { let sub: SubscriptionMap; diff --git a/client/src/app/openslides-main-module/components/openslides-main/openslides-main.component.ts b/client/src/app/openslides-main-module/components/openslides-main/openslides-main.component.ts index b4b7b49316..3e34440921 100644 --- a/client/src/app/openslides-main-module/components/openslides-main/openslides-main.component.ts +++ b/client/src/app/openslides-main-module/components/openslides-main/openslides-main.component.ts @@ -1,23 +1,31 @@ -import { ApplicationRef, Component, DOCUMENT, inject, OnInit, ViewContainerRef } from '@angular/core'; +import { + ApplicationRef, + ChangeDetectionStrategy, + Component, + DOCUMENT, + inject, + OnInit, + ViewContainerRef +} from '@angular/core'; import { MatIconRegistry } from '@angular/material/icon'; import { DomSanitizer } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { allAvailableTranslations } from '@app/domain/definitions/languages'; +import { HasSequentialNumber } from '@app/domain/interfaces'; +import { StorageService } from '@app/gateways/storage.service'; +import { langToTimeLocale } from '@app/infrastructure/utils'; +import { overloadJsFunctions } from '@app/infrastructure/utils/overload-js-functions'; +import { Deferred } from '@app/infrastructure/utils/promises'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { UpdateService } from '@app/site/modules/site-wrapper/services/update.service'; +import { CustomTranslationService } from '@app/site/modules/translations/custom-translation.service'; +import { LifecycleService } from '@app/site/services/lifecycle.service'; +import { OpenSlidesService } from '@app/site/services/openslides.service'; +import { OpenSlidesStatusService } from '@app/site/services/openslides-status.service'; +import { ViewModelStoreService } from '@app/site/services/view-model-store.service'; import { LangChangeEvent, TranslateService } from '@ngx-translate/core'; import { DateFnsConfigurationService } from 'ngx-date-fns'; import { first, firstValueFrom, tap } from 'rxjs'; -import { allAvailableTranslations } from 'src/app/domain/definitions/languages'; -import { HasSequentialNumber } from 'src/app/domain/interfaces'; -import { StorageService } from 'src/app/gateways/storage.service'; -import { langToTimeLocale } from 'src/app/infrastructure/utils'; -import { overloadJsFunctions } from 'src/app/infrastructure/utils/overload-js-functions'; -import { Deferred } from 'src/app/infrastructure/utils/promises'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { UpdateService } from 'src/app/site/modules/site-wrapper/services/update.service'; -import { CustomTranslationService } from 'src/app/site/modules/translations/custom-translation.service'; -import { LifecycleService } from 'src/app/site/services/lifecycle.service'; -import { OpenSlidesService } from 'src/app/site/services/openslides.service'; -import { OpenSlidesStatusService } from 'src/app/site/services/openslides-status.service'; -import { ViewModelStoreService } from 'src/app/site/services/view-model-store.service'; const CURRENT_LANGUAGE_STORAGE_KEY = `currentLanguage`; @@ -25,6 +33,7 @@ const CURRENT_LANGUAGE_STORAGE_KEY = `currentLanguage`; selector: `os-root`, templateUrl: `./openslides-main.component.html`, styleUrls: [`./openslides-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class OpenSlidesMainComponent implements OnInit { diff --git a/client/src/app/openslides-main-module/components/openslides-overlay-container/openslides-overlay-container.component.ts b/client/src/app/openslides-main-module/components/openslides-overlay-container/openslides-overlay-container.component.ts index 7c4ca69613..99d141655c 100644 --- a/client/src/app/openslides-main-module/components/openslides-overlay-container/openslides-overlay-container.component.ts +++ b/client/src/app/openslides-main-module/components/openslides-overlay-container/openslides-overlay-container.component.ts @@ -1,11 +1,12 @@ -import { Component, ViewContainerRef } from '@angular/core'; -import { DomService } from 'src/app/openslides-main-module/services/dom.service'; -import { SpinnerService } from 'src/app/site/modules/global-spinner'; +import { ChangeDetectionStrategy, Component, ViewContainerRef } from '@angular/core'; +import { DomService } from '@app/openslides-main-module/services/dom.service'; +import { SpinnerService } from '@app/site/modules/global-spinner'; @Component({ selector: `os-openslides-overlay-container`, templateUrl: `./openslides-overlay-container.component.html`, styleUrls: [`./openslides-overlay-container.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class OpenSlidesOverlayContainerComponent { diff --git a/client/src/app/openslides-main-module/openslides-main.module.ts b/client/src/app/openslides-main-module/openslides-main.module.ts index d8c7a1d5be..28917135e4 100644 --- a/client/src/app/openslides-main-module/openslides-main.module.ts +++ b/client/src/app/openslides-main-module/openslides-main.module.ts @@ -1,13 +1,13 @@ -import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; +import { HttpClient, provideHttpClient, withInterceptorsFromDi, withXhr } from '@angular/common/http'; import { inject, NgModule, provideAppInitializer } from '@angular/core'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ServiceWorkerModule } from '@angular/service-worker'; +import { GlobalSpinnerModule } from '@app/site/modules/global-spinner'; import { provideTranslateService, TranslateLoader, TranslateParser } from '@ngx-translate/core'; -import { GlobalSpinnerModule } from 'src/app/site/modules/global-spinner'; -import { environment } from 'src/environments/environment'; +import { environment } from '../../environments/environment'; import { CustomTranslationService } from '../site/modules/translations/custom-translation.service'; import { CustomTranslationParser } from '../site/modules/translations/translation-parser'; import { PruningTranslationLoader } from '../site/modules/translations/translation-pruning-loader'; @@ -58,7 +58,7 @@ if (isFirefox && `serviceWorker` in navigator) { return initializerFn(); }), httpInterceptorProviders, - provideHttpClient(withInterceptorsFromDi()), + provideHttpClient(withXhr(), withInterceptorsFromDi()), provideTranslateService({ fallbackLang: `en`, loader: { diff --git a/client/src/app/openslides-main-module/services/app-load.service.ts b/client/src/app/openslides-main-module/services/app-load.service.ts index 1521dcf621..90f5fcd15a 100644 --- a/client/src/app/openslides-main-module/services/app-load.service.ts +++ b/client/src/app/openslides-main-module/services/app-load.service.ts @@ -1,26 +1,26 @@ import { inject, Injectable, Injector, Type } from '@angular/core'; -import { ActionWorkerAppConfig } from 'src/app/gateways/repositories/action-worker/action-worker.config'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { MeetingUserAppConfig } from 'src/app/gateways/repositories/meeting_user/meeting-user-config'; -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; -import { OnAfterAppsLoaded } from 'src/app/infrastructure/definitions/hooks/after-apps-loaded'; -import { OpenSlidesInjector } from 'src/app/infrastructure/utils/di/openslides-injector'; -import { AgendaAppConfig } from 'src/app/site/pages/meetings/pages/agenda/agenda.config'; -import { AssignmentsAppConfig } from 'src/app/site/pages/meetings/pages/assignments/assignments.config'; -import { ChatAppConfig } from 'src/app/site/pages/meetings/pages/chat/chat.config'; -import { HistoryAppConfig } from 'src/app/site/pages/meetings/pages/history/history.config'; -import { HomeAppConfig } from 'src/app/site/pages/meetings/pages/home/home.config'; -import { MediafileAppConfig } from 'src/app/site/pages/meetings/pages/mediafiles/mediafiles.config'; -import { MeetingMediafileAppConfig } from 'src/app/site/pages/meetings/pages/mediafiles/meeting-mediafiles.config'; -import { MeetingSettingsAppConfig } from 'src/app/site/pages/meetings/pages/meeting-settings/meeting-settings.config'; -import { MotionsAppConfig } from 'src/app/site/pages/meetings/pages/motions'; -import { PollsAppConfig } from 'src/app/site/pages/meetings/pages/polls/polls.config'; -import { ProjectorAppConfig } from 'src/app/site/pages/meetings/pages/projectors/projector.config'; -import { MainMenuService } from 'src/app/site/pages/meetings/services/main-menu.service'; -import { GendersAppConfig } from 'src/app/site/pages/organization/pages/accounts/pages/gender/genders.config'; -import { CollectionMapperService } from 'src/app/site/services/collection-mapper.service'; -import { FallbackRoutesService } from 'src/app/site/services/fallback-routes.service'; -import { ModelRequestBuilderService } from 'src/app/site/services/model-request-builder'; +import { ActionWorkerAppConfig } from '@app/gateways/repositories/action-worker/action-worker.config'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { MeetingUserAppConfig } from '@app/gateways/repositories/meeting_user/meeting-user-config'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; +import { OnAfterAppsLoaded } from '@app/infrastructure/definitions/hooks/after-apps-loaded'; +import { OpenSlidesInjector } from '@app/infrastructure/utils/di/openslides-injector'; +import { AgendaAppConfig } from '@app/site/pages/meetings/pages/agenda/agenda.config'; +import { AssignmentsAppConfig } from '@app/site/pages/meetings/pages/assignments/assignments.config'; +import { ChatAppConfig } from '@app/site/pages/meetings/pages/chat/chat.config'; +import { HistoryAppConfig } from '@app/site/pages/meetings/pages/history/history.config'; +import { HomeAppConfig } from '@app/site/pages/meetings/pages/home/home.config'; +import { MediafileAppConfig } from '@app/site/pages/meetings/pages/mediafiles/mediafiles.config'; +import { MeetingMediafileAppConfig } from '@app/site/pages/meetings/pages/mediafiles/meeting-mediafiles.config'; +import { MeetingSettingsAppConfig } from '@app/site/pages/meetings/pages/meeting-settings/meeting-settings.config'; +import { MotionsAppConfig } from '@app/site/pages/meetings/pages/motions'; +import { PollsAppConfig } from '@app/site/pages/meetings/pages/polls/polls.config'; +import { ProjectorAppConfig } from '@app/site/pages/meetings/pages/projectors/projector.config'; +import { MainMenuService } from '@app/site/pages/meetings/services/main-menu.service'; +import { GendersAppConfig } from '@app/site/pages/organization/pages/accounts/pages/gender/genders.config'; +import { CollectionMapperService } from '@app/site/services/collection-mapper.service'; +import { FallbackRoutesService } from '@app/site/services/fallback-routes.service'; +import { ModelRequestBuilderService } from '@app/site/services/model-request-builder'; import { HasOnAfterAppsLoaded } from '../../infrastructure/definitions/hooks/after-apps-loaded'; import { MeetingsAppConfig } from '../../site/pages/meetings/meetings.config'; diff --git a/client/src/app/openslides-main-module/services/shared-worker.service.ts b/client/src/app/openslides-main-module/services/shared-worker.service.ts index fd0c5f2bbe..ee7a401a93 100644 --- a/client/src/app/openslides-main-module/services/shared-worker.service.ts +++ b/client/src/app/openslides-main-module/services/shared-worker.service.ts @@ -1,4 +1,5 @@ import { inject, Injectable, NgZone } from '@angular/core'; +import { SW_BROADCAST_CHANNEL_NAME, WorkerMessage, WorkerMessageContent, WorkerResponse } from '@app/worker/interfaces'; import { defer, filter, @@ -17,13 +18,8 @@ import { timeout, timer } from 'rxjs'; -import { - SW_BROADCAST_CHANNEL_NAME, - WorkerMessage, - WorkerMessageContent, - WorkerResponse -} from 'src/app/worker/interfaces'; -import { environment } from 'src/environments/environment'; + +import { environment } from '../../../environments/environment'; const SHARED_WORKER_MESSAGE_ACK_TIMEOUT = 4000; const SHARED_WORKER_READY_TIMEOUT = 10000; diff --git a/client/src/app/site/base/base-filter.service/base-filter-list.service.ts b/client/src/app/site/base/base-filter.service/base-filter-list.service.ts index 9e027fe6fe..fe9fccd18b 100644 --- a/client/src/app/site/base/base-filter.service/base-filter-list.service.ts +++ b/client/src/app/site/base/base-filter.service/base-filter-list.service.ts @@ -1,8 +1,8 @@ import { Directive } from '@angular/core'; +import { Identifiable } from '@app/domain/interfaces'; +import { ViewModelListProvider } from '@app/ui/base/view-model-list-provider'; +import { ActiveFiltersStoreService, FilterListService } from '@app/ui/modules/list/definitions/filter-service'; import { BehaviorSubject, distinctUntilChanged, map, Observable, Subscription } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ViewModelListProvider } from 'src/app/ui/base/view-model-list-provider'; -import { ActiveFiltersStoreService, FilterListService } from 'src/app/ui/modules/list/definitions/filter-service'; import { BaseViewModel } from '../base-view-model'; import { OsFilter, OsFilterIndicator, OsFilterOption, OsFilterOptionCondition, OsHideFilterSetting } from './os-filter'; diff --git a/client/src/app/site/base/base-import.service/base-backend-import.service.ts b/client/src/app/site/base/base-import.service/base-backend-import.service.ts index 6ced4996bf..8d13e6f2f4 100644 --- a/client/src/app/site/base/base-import.service/base-backend-import.service.ts +++ b/client/src/app/site/base/base-import.service/base-backend-import.service.ts @@ -1,17 +1,17 @@ import { Directive } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { TranslateService } from '@ngx-translate/core'; -import { Papa, ParseConfig } from 'ngx-papaparse'; -import { BehaviorSubject, Observable } from 'rxjs'; -import { FileReaderProgressEvent, ValueLabelCombination } from 'src/app/infrastructure/utils/import/import-utils'; -import { BackendImportService } from 'src/app/ui/base/import-service'; -import { BackendImportPhase } from 'src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component'; +import { FileReaderProgressEvent, ValueLabelCombination } from '@app/infrastructure/utils/import/import-utils'; +import { BackendImportService } from '@app/ui/base/import-service'; +import { BackendImportPhase } from '@app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component'; import { BackendImportPreview, BackendImportRawPreview, BackendImportState, isBackendImportRawPreview -} from 'src/app/ui/modules/import-list/definitions/backend-import-preview'; +} from '@app/ui/modules/import-list/definitions/backend-import-preview'; +import { TranslateService } from '@ngx-translate/core'; +import { Papa, ParseConfig } from 'ngx-papaparse'; +import { BehaviorSubject, Observable } from 'rxjs'; import { ImportServiceCollectorService } from '../../services/import-service-collector.service'; diff --git a/client/src/app/site/base/base-list-view.component.ts b/client/src/app/site/base/base-list-view.component.ts index 5bdc5b34f2..6d2da97d46 100644 --- a/client/src/app/site/base/base-list-view.component.ts +++ b/client/src/app/site/base/base-list-view.component.ts @@ -1,12 +1,9 @@ import { AfterViewInit, Directive, ViewChild } from '@angular/core'; import { NavigationStart } from '@angular/router'; +import { BaseComponent } from '@app/site/base/base.component'; +import { ListComponent } from '@app/ui/modules/list/components'; +import { END_POSITION, START_POSITION } from '@app/ui/modules/scrolling-table/directives/scrolling-table-cell-position'; import { filter } from 'rxjs'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { ListComponent } from 'src/app/ui/modules/list/components'; -import { - END_POSITION, - START_POSITION -} from 'src/app/ui/modules/scrolling-table/directives/scrolling-table-cell-position'; import { BaseViewModel } from './base-view-model'; diff --git a/client/src/app/site/base/base-model-request-handler.component/base-model-request-handler.component.ts b/client/src/app/site/base/base-model-request-handler.component/base-model-request-handler.component.ts index 25d915b0fc..96f963257c 100644 --- a/client/src/app/site/base/base-model-request-handler.component/base-model-request-handler.component.ts +++ b/client/src/app/site/base/base-model-request-handler.component/base-model-request-handler.component.ts @@ -1,9 +1,9 @@ import { Directive, EventEmitter, inject, OnDestroy, OnInit } from '@angular/core'; import { Router } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { ModelRequestService } from '@app/site/services/model-request.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { combineLatest, firstValueFrom, map, Observable, skip, startWith } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { ModelRequestService } from 'src/app/site/services/model-request.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { SubscribeToConfig } from '../../services/model-request.service'; import { OpenSlidesRouterService } from '../../services/openslides-router.service'; diff --git a/client/src/app/site/base/base-sort.service/base-sort-list.service.ts b/client/src/app/site/base/base-sort.service/base-sort-list.service.ts index 19e58c777b..9f5be121ba 100644 --- a/client/src/app/site/base/base-sort.service/base-sort-list.service.ts +++ b/client/src/app/site/base/base-sort.service/base-sort-list.service.ts @@ -1,4 +1,10 @@ import { Directive, inject, Injector, ProviderToken } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { Deferred } from '@app/infrastructure/utils/promises'; +import { deepCopy } from '@app/infrastructure/utils/transform-functions'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { SortListService } from '@app/ui/modules/list/definitions/sort-service'; import { auditTime, BehaviorSubject, @@ -8,12 +14,6 @@ import { isObservable, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { Deferred } from 'src/app/infrastructure/utils/promises'; -import { deepCopy } from 'src/app/infrastructure/utils/transform-functions'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { SortListService } from 'src/app/ui/modules/list/definitions/sort-service'; import { StorageService } from '../../../gateways/storage.service'; import { BaseViewModel } from '../base-view-model'; diff --git a/client/src/app/site/base/base-sort.service/base-sort.service.ts b/client/src/app/site/base/base-sort.service/base-sort.service.ts index 849fb7700c..1d7b4bffd6 100644 --- a/client/src/app/site/base/base-sort.service/base-sort.service.ts +++ b/client/src/app/site/base/base-sort.service/base-sort.service.ts @@ -1,8 +1,8 @@ import { Directive, inject } from '@angular/core'; +import { Displayable, Identifiable } from '@app/domain/interfaces'; +import { getIntlCollatorForLang } from '@app/infrastructure/utils'; +import { SortService } from '@app/ui/modules/list/definitions/sort-service'; import { TranslateService } from '@ngx-translate/core'; -import { Displayable, Identifiable } from 'src/app/domain/interfaces'; -import { getIntlCollatorForLang } from 'src/app/infrastructure/utils'; -import { SortService } from 'src/app/ui/modules/list/definitions/sort-service'; import { OsSortProperty } from './os-sort'; /** diff --git a/client/src/app/site/base/base-via-backend-import-list.component.ts b/client/src/app/site/base/base-via-backend-import-list.component.ts index ccde9b5273..742aad936c 100644 --- a/client/src/app/site/base/base-via-backend-import-list.component.ts +++ b/client/src/app/site/base/base-via-backend-import-list.component.ts @@ -1,9 +1,9 @@ import { Directive, OnInit, ViewChild } from '@angular/core'; -import { BaseComponent } from 'src/app/site/base/base.component'; +import { BaseComponent } from '@app/site/base/base.component'; import { BackendImportListComponent, BackendImportPhase -} from 'src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component'; +} from '@app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component'; import { getLongPreview, getShortPreview } from '../../infrastructure/utils'; import { BaseBackendImportService } from './base-import.service/base-backend-import.service'; diff --git a/client/src/app/site/base/base-view-model.ts b/client/src/app/site/base/base-view-model.ts index ed0e9519a7..4d3944fd47 100644 --- a/client/src/app/site/base/base-view-model.ts +++ b/client/src/app/site/base/base-view-model.ts @@ -1,5 +1,5 @@ +import { Collection } from '@app/domain/definitions/key-types'; import { Observable } from 'rxjs'; -import { Collection } from 'src/app/domain/definitions/key-types'; import { Fqid, Id } from '../../domain/definitions/key-types'; import { DetailNavigable } from '../../domain/interfaces/detail-navigable'; diff --git a/client/src/app/site/base/base.component.ts b/client/src/app/site/base/base.component.ts index 968e80be8d..ab32d2dc5e 100644 --- a/client/src/app/site/base/base.component.ts +++ b/client/src/app/site/base/base.component.ts @@ -2,9 +2,9 @@ import { Directive, inject, OnDestroy } from '@angular/core'; import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { StorageService } from '@app/gateways/storage.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { TranslateService } from '@ngx-translate/core'; -import { StorageService } from 'src/app/gateways/storage.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { CML, OML } from '../../domain/definitions/organization-permission'; import { Permission } from '../../domain/definitions/permission'; diff --git a/client/src/app/site/modules/chip-select/components/chip-select-chip/chip-select-chip.component.ts b/client/src/app/site/modules/chip-select/components/chip-select-chip/chip-select-chip.component.ts index ba62b2e867..29d5585b76 100644 --- a/client/src/app/site/modules/chip-select/components/chip-select-chip/chip-select-chip.component.ts +++ b/client/src/app/site/modules/chip-select/components/chip-select-chip/chip-select-chip.component.ts @@ -1,9 +1,10 @@ -import { Component, TemplateRef, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, TemplateRef, ViewChild } from '@angular/core'; @Component({ selector: `os-chip-select-chip`, templateUrl: `./chip-select-chip.component.html`, styleUrls: [`./chip-select-chip.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ChipSelectChipComponent { diff --git a/client/src/app/site/modules/chip-select/components/chip-select/chip-select.component.ts b/client/src/app/site/modules/chip-select/components/chip-select/chip-select.component.ts index f42ae13355..3e337a24c2 100644 --- a/client/src/app/site/modules/chip-select/components/chip-select/chip-select.component.ts +++ b/client/src/app/site/modules/chip-select/components/chip-select/chip-select.component.ts @@ -1,4 +1,4 @@ -import { AfterContentInit, Component, ContentChildren, input, QueryList } from '@angular/core'; +import { AfterContentInit, ChangeDetectionStrategy, Component, ContentChildren, input, QueryList } from '@angular/core'; import { ChipSelectChipComponent } from '../chip-select-chip/chip-select-chip.component'; @@ -6,6 +6,7 @@ import { ChipSelectChipComponent } from '../chip-select-chip/chip-select-chip.co selector: `os-chip-select`, templateUrl: `./chip-select.component.html`, styleUrls: [`./chip-select.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ChipSelectComponent implements AfterContentInit { diff --git a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts index 1019681824..1c7a60881e 100644 --- a/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts +++ b/client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts @@ -1,24 +1,24 @@ -import { Component, inject, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, OnInit, ViewChild } from '@angular/core'; import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; import { MatMenuTrigger } from '@angular/material/menu'; import { Router } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { allAvailableTranslations, availableTranslations } from '@app/domain/definitions/languages'; +import { getOmlVerboseName } from '@app/domain/definitions/organization-permission'; +import { largeDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { AuthService } from '@app/site/services/auth.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ThemeService } from '@app/site/services/theme.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; +import { ChessDialogComponent } from '@app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/components/chess-dialog/chess-dialog.component'; +import { ChessChallengeService } from '@app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service'; import { TranslateService } from '@ngx-translate/core'; import { Observable, Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { allAvailableTranslations, availableTranslations } from 'src/app/domain/definitions/languages'; -import { getOmlVerboseName } from 'src/app/domain/definitions/organization-permission'; -import { largeDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { AuthService } from 'src/app/site/services/auth.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ThemeService } from 'src/app/site/services/theme.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; -import { ChessDialogComponent } from 'src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/components/chess-dialog/chess-dialog.component'; -import { ChessChallengeService } from 'src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service'; import { AccountDialogMainComponent } from '../account-dialog-main/account-dialog-main.component'; @@ -26,6 +26,7 @@ import { AccountDialogMainComponent } from '../account-dialog-main/account-dialo selector: `os-account-button`, templateUrl: `./account-button.component.html`, styleUrls: [`./account-button.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AccountButtonComponent extends BaseUiComponent implements OnInit { diff --git a/client/src/app/site/modules/global-headbar/components/account-dialog-main/account-dialog-main.component.ts b/client/src/app/site/modules/global-headbar/components/account-dialog-main/account-dialog-main.component.ts index 8fa91c661a..3377b3ede9 100644 --- a/client/src/app/site/modules/global-headbar/components/account-dialog-main/account-dialog-main.component.ts +++ b/client/src/app/site/modules/global-headbar/components/account-dialog-main/account-dialog-main.component.ts @@ -1,11 +1,12 @@ -import { Component } from '@angular/core'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; -import { getDashboardMeetingListSubscriptionConfig } from 'src/app/site/pages/organization/pages/dashboard/dashboard.subscription'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; +import { getDashboardMeetingListSubscriptionConfig } from '@app/site/pages/organization/pages/dashboard/dashboard.subscription'; @Component({ selector: `os-account-dialog-main`, templateUrl: `./account-dialog-main.component.html`, styleUrls: [`./account-dialog-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AccountDialogMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.ts b/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.ts index bb9dc92fd1..2cf0522776 100644 --- a/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.ts +++ b/client/src/app/site/modules/global-headbar/components/account-dialog/account-dialog.component.ts @@ -1,18 +1,18 @@ -import { Component, inject, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, OnInit, ViewChild } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Permission } from '@app/domain/definitions/permission'; +import { PasswordForm, PasswordFormComponent } from '@app/site/modules/user-components'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { PERSONAL_FORM_CONTROLS, ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { AuthService } from '@app/site/services/auth.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { UserService } from '@app/site/services/user.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { TranslateService } from '@ngx-translate/core'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { PasswordForm, PasswordFormComponent } from 'src/app/site/modules/user-components'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { PERSONAL_FORM_CONTROLS, ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { AuthService } from 'src/app/site/services/auth.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { UserService } from 'src/app/site/services/user.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; interface MenuItem { name: string; @@ -28,6 +28,7 @@ enum MenuItems { selector: `os-account-dialog`, templateUrl: `./account-dialog.component.html`, styleUrls: [`./account-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AccountDialogComponent extends BaseUiComponent implements OnInit { diff --git a/client/src/app/site/modules/global-headbar/components/global-headbar/global-headbar.component.ts b/client/src/app/site/modules/global-headbar/components/global-headbar/global-headbar.component.ts index 58622964f3..3dfd0189f8 100644 --- a/client/src/app/site/modules/global-headbar/components/global-headbar/global-headbar.component.ts +++ b/client/src/app/site/modules/global-headbar/components/global-headbar/global-headbar.component.ts @@ -1,8 +1,8 @@ -import { Component, inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { OrganizationService } from 'src/app/site/pages/organization/services/organization.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { OrganizationService } from '@app/site/pages/organization/services/organization.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { GlobalHeadbarService } from '../../global-headbar.service'; import { GlobalSearchComponent } from '../global-search/global-search.component'; @@ -11,6 +11,7 @@ import { GlobalSearchComponent } from '../global-search/global-search.component' selector: `os-global-headbar`, templateUrl: `./global-headbar.component.html`, styleUrls: [`./global-headbar.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class GlobalHeadbarComponent { diff --git a/client/src/app/site/modules/global-headbar/components/global-search/global-search.component.html b/client/src/app/site/modules/global-headbar/components/global-search/global-search.component.html index d8d18f5ef2..c91e746b46 100644 --- a/client/src/app/site/modules/global-headbar/components/global-search/global-search.component.html +++ b/client/src/app/site/modules/global-headbar/components/global-search/global-search.component.html @@ -100,7 +100,9 @@

@if (result.title) {

@if (result.obj?.number) { - + }

diff --git a/client/src/app/site/modules/global-headbar/components/global-search/global-search.component.ts b/client/src/app/site/modules/global-headbar/components/global-search/global-search.component.ts index 054510e013..548b778d85 100644 --- a/client/src/app/site/modules/global-headbar/components/global-search/global-search.component.ts +++ b/client/src/app/site/modules/global-headbar/components/global-search/global-search.component.ts @@ -1,14 +1,14 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnDestroy } from '@angular/core'; import { FormBuilder } from '@angular/forms'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { splitStringKeepSeperator } from '@app/infrastructure/utils'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { GlobalSearchEntry, GlobalSearchResponse, GlobalSearchService } from '@app/site/services/global-search'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; import { _ } from '@ngx-translate/core'; import { pairwise, startWith, Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { splitStringKeepSeperator } from 'src/app/infrastructure/utils'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { GlobalSearchEntry, GlobalSearchResponse, GlobalSearchService } from 'src/app/site/services/global-search'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; @Component({ selector: `os-global-search`, diff --git a/client/src/app/site/modules/global-headbar/global-headbar.module.ts b/client/src/app/site/modules/global-headbar/global-headbar.module.ts index 192a0af3ef..5e16047f7d 100644 --- a/client/src/app/site/modules/global-headbar/global-headbar.module.ts +++ b/client/src/app/site/modules/global-headbar/global-headbar.module.ts @@ -16,10 +16,10 @@ import { MatRadioModule } from '@angular/material/radio'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { InputModule } from 'src/app/ui/modules/input'; -import { ChessDialogModule } from 'src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog'; +import { DirectivesModule } from '@app/ui/directives'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { InputModule } from '@app/ui/modules/input'; +import { ChessDialogModule } from '@app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog'; import { OpenSlidesTranslationModule } from '../translations'; import { UserComponentsModule } from '../user-components'; diff --git a/client/src/app/site/modules/global-spinner/components/global-spinner/global-spinner.component.ts b/client/src/app/site/modules/global-spinner/components/global-spinner/global-spinner.component.ts index 45ff00fba7..49ec264f09 100644 --- a/client/src/app/site/modules/global-spinner/components/global-spinner/global-spinner.component.ts +++ b/client/src/app/site/modules/global-spinner/components/global-spinner/global-spinner.component.ts @@ -1,8 +1,8 @@ -import { Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { ConnectionStatusService } from '@app/site/services/connection-status.service'; +import { LifecycleService } from '@app/site/services/lifecycle.service'; +import { SpinnerComponent } from '@app/ui/modules/spinner/components/spinner/spinner.component'; import { TranslateService } from '@ngx-translate/core'; -import { ConnectionStatusService } from 'src/app/site/services/connection-status.service'; -import { LifecycleService } from 'src/app/site/services/lifecycle.service'; -import { SpinnerComponent } from 'src/app/ui/modules/spinner/components/spinner/spinner.component'; import { UpdateService } from '../../../site-wrapper/services/update.service'; @@ -10,6 +10,7 @@ import { UpdateService } from '../../../site-wrapper/services/update.service'; selector: `os-global-spinner`, templateUrl: `./global-spinner.component.html`, styleUrls: [`./global-spinner.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class GlobalSpinnerComponent extends SpinnerComponent { diff --git a/client/src/app/site/modules/global-spinner/definitions/index.ts b/client/src/app/site/modules/global-spinner/definitions/index.ts index 2f22c69de7..ad21826ac7 100644 --- a/client/src/app/site/modules/global-spinner/definitions/index.ts +++ b/client/src/app/site/modules/global-spinner/definitions/index.ts @@ -1,4 +1,4 @@ -import { CustomOverlayConfig } from 'src/app/ui/modules/openslides-overlay'; +import { CustomOverlayConfig } from '@app/ui/modules/openslides-overlay'; export interface SpinnerConfig extends CustomOverlayConfig { /** diff --git a/client/src/app/site/modules/global-spinner/global-spinner.module.ts b/client/src/app/site/modules/global-spinner/global-spinner.module.ts index 1d130c516b..4af9ad7de8 100644 --- a/client/src/app/site/modules/global-spinner/global-spinner.module.ts +++ b/client/src/app/site/modules/global-spinner/global-spinner.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { OverlayComponent } from 'src/app/ui/modules/openslides-overlay'; -import { SpinnerModule } from 'src/app/ui/modules/spinner'; +import { OverlayComponent } from '@app/ui/modules/openslides-overlay'; +import { SpinnerModule } from '@app/ui/modules/spinner'; import { OpenSlidesTranslationModule } from '../translations'; import { GlobalSpinnerComponent } from './components/global-spinner/global-spinner.component'; diff --git a/client/src/app/site/modules/global-spinner/services/spinner.service.ts b/client/src/app/site/modules/global-spinner/services/spinner.service.ts index 1c707fb238..fa272054d0 100644 --- a/client/src/app/site/modules/global-spinner/services/spinner.service.ts +++ b/client/src/app/site/modules/global-spinner/services/spinner.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { EventType, Router, RoutesRecognized } from '@angular/router'; +import { ConnectionStatusService } from '@app/site/services/connection-status.service'; +import { OpenSlidesStatusService } from '@app/site/services/openslides-status.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { OverlayInstance, OverlayService } from '@app/ui/modules/openslides-overlay'; import { combineLatest, filter, startWith, Subscription } from 'rxjs'; -import { ConnectionStatusService } from 'src/app/site/services/connection-status.service'; -import { OpenSlidesStatusService } from 'src/app/site/services/openslides-status.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { OverlayInstance, OverlayService } from 'src/app/ui/modules/openslides-overlay'; import { GlobalSpinnerComponent } from '../components/global-spinner/global-spinner.component'; import { SpinnerConfig } from '../definitions'; diff --git a/client/src/app/site/modules/info/components/info-actions/info-actions.component.ts b/client/src/app/site/modules/info/components/info-actions/info-actions.component.ts index 2ef1bf0fe9..2531805f00 100644 --- a/client/src/app/site/modules/info/components/info-actions/info-actions.component.ts +++ b/client/src/app/site/modules/info/components/info-actions/info-actions.component.ts @@ -1,11 +1,12 @@ -import { Component } from '@angular/core'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { LifecycleService } from 'src/app/site/services/lifecycle.service'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseComponent } from '@app/site/base/base.component'; +import { LifecycleService } from '@app/site/services/lifecycle.service'; @Component({ selector: `os-info-actions`, templateUrl: `./info-actions.component.html`, styleUrls: [`./info-actions.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class InfoActionsComponent extends BaseComponent { diff --git a/client/src/app/site/modules/info/components/legal-notice-content/legal-notice-content.component.ts b/client/src/app/site/modules/info/components/legal-notice-content/legal-notice-content.component.ts index 7f62af6026..170f1d78c6 100644 --- a/client/src/app/site/modules/info/components/legal-notice-content/legal-notice-content.component.ts +++ b/client/src/app/site/modules/info/components/legal-notice-content/legal-notice-content.component.ts @@ -1,16 +1,17 @@ import { HttpClient } from '@angular/common/http'; -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; @Component({ selector: `os-legal-notice-content`, templateUrl: `./legal-notice-content.component.html`, styleUrls: [`./legal-notice-content.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class LegalNoticeContentComponent extends BaseUiComponent implements OnInit { diff --git a/client/src/app/site/modules/info/components/privacy-policy-content/privacy-policy-content.component.ts b/client/src/app/site/modules/info/components/privacy-policy-content/privacy-policy-content.component.ts index 62a30ea216..53fe5511f6 100644 --- a/client/src/app/site/modules/info/components/privacy-policy-content/privacy-policy-content.component.ts +++ b/client/src/app/site/modules/info/components/privacy-policy-content/privacy-policy-content.component.ts @@ -1,14 +1,15 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { TranslateService } from '@ngx-translate/core'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; @Component({ selector: `os-privacy-policy-content`, templateUrl: `./privacy-policy-content.component.html`, styleUrls: [`./privacy-policy-content.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class PrivacyPolicyContentComponent extends BaseUiComponent implements OnInit { diff --git a/client/src/app/site/modules/info/info.module.ts b/client/src/app/site/modules/info/info.module.ts index ee4e00cb86..a64c92d115 100644 --- a/client/src/app/site/modules/info/info.module.ts +++ b/client/src/app/site/modules/info/info.module.ts @@ -6,11 +6,11 @@ import { MatCardModule } from '@angular/material/card'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { EditorModule } from 'src/app/ui/modules/editor'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { PipesModule } from 'src/app/ui/pipes'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { EditorModule } from '@app/ui/modules/editor'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { PipesModule } from '@app/ui/pipes'; import { InfoActionsComponent } from './components/info-actions/info-actions.component'; import { LegalNoticeContentComponent } from './components/legal-notice-content/legal-notice-content.component'; diff --git a/client/src/app/site/modules/site-wrapper/components/banner/banner.component.ts b/client/src/app/site/modules/site-wrapper/components/banner/banner.component.ts index 62cfa93e24..b77f8483e9 100644 --- a/client/src/app/site/modules/site-wrapper/components/banner/banner.component.ts +++ b/client/src/app/site/modules/site-wrapper/components/banner/banner.component.ts @@ -1,7 +1,7 @@ import { ComponentPortal } from '@angular/cdk/portal'; -import { Component, OnDestroy } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnDestroy } from '@angular/core'; +import { Constructable } from '@app/domain/interfaces/constructable'; import { Observable } from 'rxjs'; -import { Constructable } from 'src/app/domain/interfaces/constructable'; import { BannerDefinition, BannerService } from '../../services/banner.service'; @@ -9,6 +9,7 @@ import { BannerDefinition, BannerService } from '../../services/banner.service'; selector: `os-banner`, templateUrl: `./banner.component.html`, styleUrls: [`./banner.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class BannerComponent implements OnDestroy { diff --git a/client/src/app/site/modules/site-wrapper/components/site-wrapper/site-wrapper.component.ts b/client/src/app/site/modules/site-wrapper/components/site-wrapper/site-wrapper.component.ts index 120c236384..56a91f57bb 100644 --- a/client/src/app/site/modules/site-wrapper/components/site-wrapper/site-wrapper.component.ts +++ b/client/src/app/site/modules/site-wrapper/components/site-wrapper/site-wrapper.component.ts @@ -1,8 +1,16 @@ -import { Component, EmbeddedViewRef, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + EmbeddedViewRef, + OnDestroy, + OnInit, + TemplateRef, + ViewChild +} from '@angular/core'; import { MatSnackBar, MatSnackBarRef } from '@angular/material/snack-bar'; import { ActivationEnd, Router } from '@angular/router'; -import { SubscriptionMap } from 'src/app/infrastructure/utils/subscription-map'; -import { ThemeService } from 'src/app/site/services/theme.service'; +import { SubscriptionMap } from '@app/infrastructure/utils/subscription-map'; +import { ThemeService } from '@app/site/services/theme.service'; import { UpdateService } from '../../services/update.service'; import { VotingBannerService } from '../../services/voting-banner.service'; @@ -19,6 +27,7 @@ interface RoutingData { selector: `os-site-wrapper`, templateUrl: `./site-wrapper.component.html`, styleUrls: [`./site-wrapper.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class SiteWrapperComponent implements OnInit, OnDestroy { diff --git a/client/src/app/site/modules/site-wrapper/services/banner.service.ts b/client/src/app/site/modules/site-wrapper/services/banner.service.ts index b5a819b790..a2082c4fd8 100644 --- a/client/src/app/site/modules/site-wrapper/services/banner.service.ts +++ b/client/src/app/site/modules/site-wrapper/services/banner.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; +import { Constructable } from '@app/domain/interfaces/constructable'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Constructable } from 'src/app/domain/interfaces/constructable'; export class BannerDefinition { public type?: string; diff --git a/client/src/app/site/modules/site-wrapper/services/site-wrapper-service.module.ts b/client/src/app/site/modules/site-wrapper/services/site-wrapper-service.module.ts index 939a432929..58fcfd5d0e 100644 --- a/client/src/app/site/modules/site-wrapper/services/site-wrapper-service.module.ts +++ b/client/src/app/site/modules/site-wrapper/services/site-wrapper-service.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { PollModule } from 'src/app/site/pages/meetings/modules/poll'; +import { PollModule } from '@app/site/pages/meetings/modules/poll'; @NgModule({ imports: [PollModule] }) export class SiteWrapperServiceModule {} diff --git a/client/src/app/site/modules/site-wrapper/services/update.service.ts b/client/src/app/site/modules/site-wrapper/services/update.service.ts index 02c016c1b2..2fe3654d6c 100644 --- a/client/src/app/site/modules/site-wrapper/services/update.service.ts +++ b/client/src/app/site/modules/site-wrapper/services/update.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { SwUpdate, VersionReadyEvent } from '@angular/service-worker'; +import { StorageService } from '@app/gateways/storage.service'; import { filter, Observable, Subject } from 'rxjs'; -import { StorageService } from 'src/app/gateways/storage.service'; @Injectable({ providedIn: `root` diff --git a/client/src/app/site/modules/site-wrapper/services/voting-banner.service.ts b/client/src/app/site/modules/site-wrapper/services/voting-banner.service.ts index 79aa379383..7581423728 100644 --- a/client/src/app/site/modules/site-wrapper/services/voting-banner.service.ts +++ b/client/src/app/site/modules/site-wrapper/services/voting-banner.service.ts @@ -1,17 +1,17 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { viewModelListEqual } from '@app/infrastructure/utils'; +import { VoteControllerService } from '@app/site/pages/meetings/modules/poll/services/vote-controller.service'; +import { VotingService } from '@app/site/pages/meetings/modules/poll/services/voting.service'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { ActivePollsService } from '@app/site/pages/meetings/services/active-polls.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { combineLatest, distinctUntilChanged, Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { viewModelListEqual } from 'src/app/infrastructure/utils'; -import { VoteControllerService } from 'src/app/site/pages/meetings/modules/poll/services/vote-controller.service'; -import { VotingService } from 'src/app/site/pages/meetings/modules/poll/services/voting.service'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { ActivePollsService } from 'src/app/site/pages/meetings/services/active-polls.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { BannerDefinition, BannerService } from './banner.service'; diff --git a/client/src/app/site/modules/site-wrapper/site-wrapper.module.ts b/client/src/app/site/modules/site-wrapper/site-wrapper.module.ts index 855c7bee0e..39edcf4bd8 100644 --- a/client/src/app/site/modules/site-wrapper/site-wrapper.module.ts +++ b/client/src/app/site/modules/site-wrapper/site-wrapper.module.ts @@ -4,8 +4,8 @@ import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { RouterModule } from '@angular/router'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; import { BannerComponent } from './components/banner/banner.component'; import { SiteWrapperComponent } from './components/site-wrapper/site-wrapper.component'; diff --git a/client/src/app/site/modules/user-components/components/password-form/password-form.component.ts b/client/src/app/site/modules/user-components/components/password-form/password-form.component.ts index 968bc1907b..ed61b3cb6b 100644 --- a/client/src/app/site/modules/user-components/components/password-form/password-form.component.ts +++ b/client/src/app/site/modules/user-components/components/password-form/password-form.component.ts @@ -1,7 +1,7 @@ -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, OnInit, Output } from '@angular/core'; import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; +import { BaseComponent } from '@app/site/base/base.component'; import { _ } from '@ngx-translate/core'; -import { BaseComponent } from 'src/app/site/base/base.component'; import { PasswordForm } from '../../definitions'; import { PasswordValidator } from '../../validators'; @@ -25,6 +25,7 @@ const PointlessPasswordFeedback = _(`New and old passwords are identical!`); selector: `os-password-form`, templateUrl: `./password-form.component.html`, styleUrls: [`./password-form.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class PasswordFormComponent extends BaseComponent implements OnInit { diff --git a/client/src/app/site/modules/user-components/components/user-delete-dialog/user-delete-dialog.component.ts b/client/src/app/site/modules/user-components/components/user-delete-dialog/user-delete-dialog.component.ts index ac034008d7..9074af11c0 100644 --- a/client/src/app/site/modules/user-components/components/user-delete-dialog/user-delete-dialog.component.ts +++ b/client/src/app/site/modules/user-components/components/user-delete-dialog/user-delete-dialog.component.ts @@ -1,12 +1,12 @@ -import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { CML } from 'src/app/domain/definitions/organization-permission'; +import { CML } from '@app/domain/definitions/organization-permission'; import { GetUserRelatedModelsCommittee, GetUserRelatedModelsPresenterResult, GetUserRelatedModelsUser -} from 'src/app/gateways/presenter'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; +} from '@app/gateways/presenter'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; interface UserDeleteDialogConfig { toRemove: ViewUser[]; @@ -18,6 +18,7 @@ interface UserDeleteDialogConfig { templateUrl: `./user-delete-dialog.component.html`, styleUrls: [`./user-delete-dialog.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class UserDeleteDialogComponent implements OnInit { diff --git a/client/src/app/site/modules/user-components/components/user-detail-view/user-detail-view.component.html b/client/src/app/site/modules/user-components/components/user-detail-view/user-detail-view.component.html index 2fa6fdfea2..91d951780a 100644 --- a/client/src/app/site/modules/user-components/components/user-detail-view/user-detail-view.component.html +++ b/client/src/app/site/modules/user-components/components/user-detail-view/user-detail-view.component.html @@ -240,7 +240,7 @@

{{ 'Name' | translate }}

@if (user.gender) {

{{ 'Gender' | translate }}

- {{ user.gender?.name | translate }} + {{ $safeNavigationMigration(user.gender?.name) | translate }}
} diff --git a/client/src/app/site/modules/user-components/components/user-detail-view/user-detail-view.component.ts b/client/src/app/site/modules/user-components/components/user-detail-view/user-detail-view.component.ts index d75352465b..33637c5809 100644 --- a/client/src/app/site/modules/user-components/components/user-detail-view/user-detail-view.component.ts +++ b/client/src/app/site/modules/user-components/components/user-detail-view/user-detail-view.component.ts @@ -1,5 +1,6 @@ import { AfterViewInit, + ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, @@ -19,13 +20,13 @@ import { ValidatorFn, Validators } from '@angular/forms'; +import { createEmailValidator } from '@app/infrastructure/utils/validators/email'; +import { getGenderListSubscriptionConfig } from '@app/site/pages/organization/pages/accounts/pages/gender/gender.subscription'; +import { GenderControllerService } from '@app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { TranslateService } from '@ngx-translate/core'; import { map, OperatorFunction, Subscription } from 'rxjs'; -import { createEmailValidator } from 'src/app/infrastructure/utils/validators/email'; -import { getGenderListSubscriptionConfig } from 'src/app/site/pages/organization/pages/accounts/pages/gender/gender.subscription'; -import { GenderControllerService } from 'src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { ViewUser } from '../../../../../site/pages/meetings/view-models/view-user'; import { OneOfValidator } from '../../validators'; @@ -34,6 +35,7 @@ import { OneOfValidator } from '../../validators'; selector: `os-user-detail-view`, templateUrl: `./user-detail-view.component.html`, styleUrls: [`./user-detail-view.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class UserDetailViewComponent extends BaseUiComponent implements OnInit, AfterViewInit { diff --git a/client/src/app/site/modules/user-components/components/user-multiselect-actions/user-multiselect-actions.component.ts b/client/src/app/site/modules/user-components/components/user-multiselect-actions/user-multiselect-actions.component.ts index 7a96f24609..4a02bfec14 100644 --- a/client/src/app/site/modules/user-components/components/user-multiselect-actions/user-multiselect-actions.component.ts +++ b/client/src/app/site/modules/user-components/components/user-multiselect-actions/user-multiselect-actions.component.ts @@ -8,12 +8,12 @@ import { TemplateRef, viewChild } from '@angular/core'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; +import { BaseComponent } from '@app/site/base/base.component'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OperatorService } from '@app/site/services/operator.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; @Component({ selector: `os-user-multiselect-actions`, diff --git a/client/src/app/site/modules/user-components/components/user-password-form/user-password-form.component.ts b/client/src/app/site/modules/user-components/components/user-password-form/user-password-form.component.ts index f1af76dc68..bd6a17ed38 100644 --- a/client/src/app/site/modules/user-components/components/user-password-form/user-password-form.component.ts +++ b/client/src/app/site/modules/user-components/components/user-password-form/user-password-form.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { Subscription } from 'rxjs'; @@ -10,6 +10,7 @@ import { PasswordForm } from '../../definitions'; selector: `os-user-password-form`, templateUrl: `./user-password-form.component.html`, styleUrls: [`./user-password-form.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class UserPasswordFormComponent implements OnInit, OnDestroy { diff --git a/client/src/app/site/modules/user-components/services/user-delete-dialog.service.ts b/client/src/app/site/modules/user-components/services/user-delete-dialog.service.ts index 499d8b5c3a..1d9b53f58a 100644 --- a/client/src/app/site/modules/user-components/services/user-delete-dialog.service.ts +++ b/client/src/app/site/modules/user-components/services/user-delete-dialog.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { _ } from '@ngx-translate/core'; import { GetUserRelatedModelsPresenterResult, GetUserRelatedModelsPresenterService -} from 'src/app/gateways/presenter/get-user-related-models-presenter.service'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +} from '@app/gateways/presenter/get-user-related-models-presenter.service'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; +import { _ } from '@ngx-translate/core'; import { UserDeleteDialogComponent } from '../components'; diff --git a/client/src/app/site/modules/user-components/user-components.module.ts b/client/src/app/site/modules/user-components/user-components.module.ts index 144b886d8a..360bf027ec 100644 --- a/client/src/app/site/modules/user-components/user-components.module.ts +++ b/client/src/app/site/modules/user-components/user-components.module.ts @@ -13,8 +13,8 @@ import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; import { OpenSlidesTranslationModule } from '../../../site/modules/translations/openslides-translation.module'; import { PasswordFormComponent } from './components/password-form/password-form.component'; diff --git a/client/src/app/site/modules/wait-for-action-dialog/components/stopped-waiting-for-action-dialog/stopped-waiting-for-action-dialog.component.ts b/client/src/app/site/modules/wait-for-action-dialog/components/stopped-waiting-for-action-dialog/stopped-waiting-for-action-dialog.component.ts index d9aa17f364..00d6e97382 100644 --- a/client/src/app/site/modules/wait-for-action-dialog/components/stopped-waiting-for-action-dialog/stopped-waiting-for-action-dialog.component.ts +++ b/client/src/app/site/modules/wait-for-action-dialog/components/stopped-waiting-for-action-dialog/stopped-waiting-for-action-dialog.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { WaitForActionDialogService } from '../../services/wait-for-action-dialog.service'; @@ -7,6 +7,7 @@ import { WaitForActionDialogService } from '../../services/wait-for-action-dialo selector: `os-stopped-waiting-for-action-dialog`, templateUrl: `./stopped-waiting-for-action-dialog.component.html`, styleUrls: [`./stopped-waiting-for-action-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class StoppedWaitingForActionDialogComponent extends BaseUiComponent { diff --git a/client/src/app/site/modules/wait-for-action-dialog/components/wait-for-action-banner/wait-for-action-banner.component.ts b/client/src/app/site/modules/wait-for-action-dialog/components/wait-for-action-banner/wait-for-action-banner.component.ts index c254da0199..408b9b36e3 100644 --- a/client/src/app/site/modules/wait-for-action-dialog/components/wait-for-action-banner/wait-for-action-banner.component.ts +++ b/client/src/app/site/modules/wait-for-action-dialog/components/wait-for-action-banner/wait-for-action-banner.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { BehaviorSubject } from 'rxjs'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { titleVerbose, WaitForActionData, WaitForActionReason, waitForActionReason } from '../../definitions'; import { WaitForActionDialogService } from '../../services'; diff --git a/client/src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service.ts b/client/src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service.ts index 747b53dcd8..2f7a2d441d 100644 --- a/client/src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service.ts +++ b/client/src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service.ts @@ -1,11 +1,11 @@ import { Injectable, Injector } from '@angular/core'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { Id } from '@app/domain/definitions/key-types'; +import { ActionWorker } from '@app/domain/models/action-worker/action-worker'; +import { ActionWorkerWatchService } from '@app/gateways/action-worker-watch/action-worker-watch.service'; +import { ActionWorkerRepositoryService } from '@app/gateways/repositories/action-worker/action-worker-repository.service'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { ActionWorker } from 'src/app/domain/models/action-worker/action-worker'; -import { ActionWorkerWatchService } from 'src/app/gateways/action-worker-watch/action-worker-watch.service'; -import { ActionWorkerRepositoryService } from 'src/app/gateways/repositories/action-worker/action-worker-repository.service'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; import { BannerService } from '../../site-wrapper/services/banner.service'; import { StoppedWaitingForActionDialogComponent } from '../components/stopped-waiting-for-action-dialog/stopped-waiting-for-action-dialog.component'; diff --git a/client/src/app/site/pages/error/components/error-main/error-main.component.ts b/client/src/app/site/pages/error/components/error-main/error-main.component.ts index e96726ae9b..4a3934add1 100644 --- a/client/src/app/site/pages/error/components/error-main/error-main.component.ts +++ b/client/src/app/site/pages/error/components/error-main/error-main.component.ts @@ -1,13 +1,14 @@ -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { AuthService } from 'src/app/site/services/auth.service'; -import { FallbackRoutesService } from 'src/app/site/services/fallback-routes.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; +import { AuthService } from '@app/site/services/auth.service'; +import { FallbackRoutesService } from '@app/site/services/fallback-routes.service'; +import { OperatorService } from '@app/site/services/operator.service'; @Component({ selector: `os-error-main`, templateUrl: `./error-main.component.html`, styleUrls: [`./error-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ErrorMainComponent implements OnInit { diff --git a/client/src/app/site/pages/error/error.module.ts b/client/src/app/site/pages/error/error.module.ts index 176aad3cdf..8f82c5e15d 100644 --- a/client/src/app/site/pages/error/error.module.ts +++ b/client/src/app/site/pages/error/error.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { ErrorMainComponent } from './components/error-main/error-main.component'; import { ErrorRoutingModule } from './error-routing.module'; diff --git a/client/src/app/site/pages/login/modules/login-wrapper/components/login-wrapper/login-wrapper.component.ts b/client/src/app/site/pages/login/modules/login-wrapper/components/login-wrapper/login-wrapper.component.ts index db136f567e..9fb04e90c0 100644 --- a/client/src/app/site/pages/login/modules/login-wrapper/components/login-wrapper/login-wrapper.component.ts +++ b/client/src/app/site/pages/login/modules/login-wrapper/components/login-wrapper/login-wrapper.component.ts @@ -1,10 +1,11 @@ -import { Component, OnInit } from '@angular/core'; -import { BaseComponent } from 'src/app/site/base/base.component'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { BaseComponent } from '@app/site/base/base.component'; @Component({ selector: `os-login-wrapper`, templateUrl: `./login-wrapper.component.html`, styleUrls: [`./login-wrapper.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class LoginWrapperComponent extends BaseComponent implements OnInit { diff --git a/client/src/app/site/pages/login/modules/login-wrapper/login-wrapper.module.ts b/client/src/app/site/pages/login/modules/login-wrapper/login-wrapper.module.ts index 819f3c4922..aa62d4aa94 100644 --- a/client/src/app/site/pages/login/modules/login-wrapper/login-wrapper.module.ts +++ b/client/src/app/site/pages/login/modules/login-wrapper/login-wrapper.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatToolbarModule } from '@angular/material/toolbar'; import { RouterModule } from '@angular/router'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { LoginWrapperComponent } from './components/login-wrapper/login-wrapper.component'; diff --git a/client/src/app/site/pages/login/pages/legal-notice/components/legal-notice/legal-notice.component.ts b/client/src/app/site/pages/login/pages/legal-notice/components/legal-notice/legal-notice.component.ts index 7885038e7b..bd9c1598d3 100644 --- a/client/src/app/site/pages/login/pages/legal-notice/components/legal-notice/legal-notice.component.ts +++ b/client/src/app/site/pages/login/pages/legal-notice/components/legal-notice/legal-notice.component.ts @@ -1,9 +1,10 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; @Component({ selector: `os-legal-notice`, templateUrl: `./legal-notice.component.html`, styleUrls: [`./legal-notice.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class LegalNoticeComponent {} diff --git a/client/src/app/site/pages/login/pages/legal-notice/legal-notice.module.ts b/client/src/app/site/pages/login/pages/legal-notice/legal-notice.module.ts index d68e88ae4b..195d78b8ae 100644 --- a/client/src/app/site/pages/login/pages/legal-notice/legal-notice.module.ts +++ b/client/src/app/site/pages/login/pages/legal-notice/legal-notice.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { InfoModule } from 'src/app/site/modules/info'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { InfoModule } from '@app/site/modules/info'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { LegalNoticeComponent } from './components/legal-notice/legal-notice.component'; import { LegalNoticeRoutingModule } from './legal-notice-routing.module'; diff --git a/client/src/app/site/pages/login/pages/login-mask/components/login-mask/login-mask.component.ts b/client/src/app/site/pages/login/pages/login-mask/components/login-mask/login-mask.component.ts index 9ab1c70a96..b7a17f527d 100644 --- a/client/src/app/site/pages/login/pages/login-mask/components/login-mask/login-mask.component.ts +++ b/client/src/app/site/pages/login/pages/login-mask/components/login-mask/login-mask.component.ts @@ -1,22 +1,22 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; +import { Meeting } from '@app/domain/models/meetings/meeting'; +import { fadeInAnim } from '@app/infrastructure/animations'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { ORGANIZATION_ID, OrganizationService } from '@app/site/pages/organization/services/organization.service'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { ViewOrganization } from '@app/site/pages/organization/view-models/view-organization'; +import { AuthService } from '@app/site/services/auth.service'; +import { AutoupdateService } from '@app/site/services/autoupdate'; +import { ModelRequestBuilderService } from '@app/site/services/model-request-builder'; +import { OpenSlidesRouterService } from '@app/site/services/openslides-router.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ParentErrorStateMatcher } from '@app/ui/modules/search-selector/validators'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { filter, Observable, Subscription } from 'rxjs'; -import { Meeting } from 'src/app/domain/models/meetings/meeting'; -import { fadeInAnim } from 'src/app/infrastructure/animations'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { ORGANIZATION_ID, OrganizationService } from 'src/app/site/pages/organization/services/organization.service'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; -import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization'; -import { AuthService } from 'src/app/site/services/auth.service'; -import { AutoupdateService } from 'src/app/site/services/autoupdate'; -import { ModelRequestBuilderService } from 'src/app/site/services/model-request-builder'; -import { OpenSlidesRouterService } from 'src/app/site/services/openslides-router.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ParentErrorStateMatcher } from 'src/app/ui/modules/search-selector/validators'; import { BrowserSupportService } from '../../../../services/browser-support.service'; @@ -35,6 +35,7 @@ interface LoginValues { templateUrl: `./login-mask.component.html`, styleUrls: [`./login-mask.component.scss`], animations: [fadeInAnim], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class LoginMaskComponent extends BaseMeetingComponent implements OnInit, OnDestroy { diff --git a/client/src/app/site/pages/login/pages/login-mask/login-mask.module.ts b/client/src/app/site/pages/login/pages/login-mask/login-mask.module.ts index d46e129b18..0369151174 100644 --- a/client/src/app/site/pages/login/pages/login-mask/login-mask.module.ts +++ b/client/src/app/site/pages/login/pages/login-mask/login-mask.module.ts @@ -7,9 +7,9 @@ import { MatExpansionModule } from '@angular/material/expansion'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { SpinnerModule } from 'src/app/ui/modules/spinner'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { SpinnerModule } from '@app/ui/modules/spinner'; import { LoginMaskComponent } from './components/login-mask/login-mask.component'; import { LoginMaskRoutingModule } from './login-mask-routing.module'; diff --git a/client/src/app/site/pages/login/pages/privacy-policy/components/privacy-policy/privacy-policy.component.ts b/client/src/app/site/pages/login/pages/privacy-policy/components/privacy-policy/privacy-policy.component.ts index 8a07cdba70..6461b764ba 100644 --- a/client/src/app/site/pages/login/pages/privacy-policy/components/privacy-policy/privacy-policy.component.ts +++ b/client/src/app/site/pages/login/pages/privacy-policy/components/privacy-policy/privacy-policy.component.ts @@ -1,9 +1,10 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; @Component({ selector: `os-privacy-policy`, templateUrl: `./privacy-policy.component.html`, styleUrls: [`./privacy-policy.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class PrivacyPolicyComponent {} diff --git a/client/src/app/site/pages/login/pages/privacy-policy/privacy-policy.module.ts b/client/src/app/site/pages/login/pages/privacy-policy/privacy-policy.module.ts index c328f6b836..fa7fabde28 100644 --- a/client/src/app/site/pages/login/pages/privacy-policy/privacy-policy.module.ts +++ b/client/src/app/site/pages/login/pages/privacy-policy/privacy-policy.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { InfoModule } from 'src/app/site/modules/info'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { InfoModule } from '@app/site/modules/info'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component'; import { PrivacyPolicyRoutingModule } from './privacy-policy-routing.module'; diff --git a/client/src/app/site/pages/login/pages/reset-password-confirm/components/reset-password-confirm/reset-password-confirm.component.ts b/client/src/app/site/pages/login/pages/reset-password-confirm/components/reset-password-confirm/reset-password-confirm.component.ts index 6d0f96be5d..dfa9c27f64 100644 --- a/client/src/app/site/pages/login/pages/reset-password-confirm/components/reset-password-confirm/reset-password-confirm.component.ts +++ b/client/src/app/site/pages/login/pages/reset-password-confirm/components/reset-password-confirm/reset-password-confirm.component.ts @@ -1,15 +1,16 @@ -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { BaseComponent } from '@app/site/base/base.component'; +import { UserControllerService } from '@app/site/services/user-controller.service'; import { TranslateService } from '@ngx-translate/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; @Component({ selector: `os-reset-password-confirm`, templateUrl: `./reset-password-confirm.component.html`, styleUrls: [`./reset-password-confirm.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ResetPasswordConfirmComponent extends BaseComponent implements OnInit { diff --git a/client/src/app/site/pages/login/pages/reset-password-confirm/reset-password-confirm.module.ts b/client/src/app/site/pages/login/pages/reset-password-confirm/reset-password-confirm.module.ts index 34bb9fad45..3bb73dae66 100644 --- a/client/src/app/site/pages/login/pages/reset-password-confirm/reset-password-confirm.module.ts +++ b/client/src/app/site/pages/login/pages/reset-password-confirm/reset-password-confirm.module.ts @@ -5,7 +5,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { ResetPasswordConfirmComponent } from './components/reset-password-confirm/reset-password-confirm.component'; import { ResetPasswordConfirmRoutingModule } from './reset-password-confirm-routing.module'; diff --git a/client/src/app/site/pages/login/pages/reset-password/components/reset-password/reset-password.component.ts b/client/src/app/site/pages/login/pages/reset-password/components/reset-password/reset-password.component.ts index c4807db64d..2d1e8c752f 100644 --- a/client/src/app/site/pages/login/pages/reset-password/components/reset-password/reset-password.component.ts +++ b/client/src/app/site/pages/login/pages/reset-password/components/reset-password/reset-password.component.ts @@ -1,14 +1,15 @@ -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { createEmailValidator } from '@app/infrastructure/utils/validators/email'; +import { BaseComponent } from '@app/site/base/base.component'; +import { UserControllerService } from '@app/site/services/user-controller.service'; import { TranslateService } from '@ngx-translate/core'; -import { createEmailValidator } from 'src/app/infrastructure/utils/validators/email'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; @Component({ selector: `os-reset-password`, templateUrl: `./reset-password.component.html`, styleUrls: [`./reset-password.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ResetPasswordComponent extends BaseComponent implements OnInit { diff --git a/client/src/app/site/pages/login/pages/reset-password/reset-password.module.ts b/client/src/app/site/pages/login/pages/reset-password/reset-password.module.ts index 4ad10b8a12..2aae207ff3 100644 --- a/client/src/app/site/pages/login/pages/reset-password/reset-password.module.ts +++ b/client/src/app/site/pages/login/pages/reset-password/reset-password.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; import { ResetPasswordComponent } from './components/reset-password/reset-password.component'; import { ResetPasswordRoutingModule } from './reset-password-routing.module'; diff --git a/client/src/app/site/pages/login/pages/unsupported-browser/components/unsupported-browser/unsupported-browser.component.ts b/client/src/app/site/pages/login/pages/unsupported-browser/components/unsupported-browser/unsupported-browser.component.ts index b634391536..38b343461c 100644 --- a/client/src/app/site/pages/login/pages/unsupported-browser/components/unsupported-browser/unsupported-browser.component.ts +++ b/client/src/app/site/pages/login/pages/unsupported-browser/components/unsupported-browser/unsupported-browser.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { BrowserRecommendation, BrowserSupportService } from '../../../../services/browser-support.service'; @@ -6,6 +6,7 @@ import { BrowserRecommendation, BrowserSupportService } from '../../../../servic selector: `os-unsupported-browser`, templateUrl: `./unsupported-browser.component.html`, styleUrls: [`./unsupported-browser.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class UnsupportedBrowserComponent implements OnInit { diff --git a/client/src/app/site/pages/login/pages/unsupported-browser/unsupported-browser.module.ts b/client/src/app/site/pages/login/pages/unsupported-browser/unsupported-browser.module.ts index d75dc8f8ef..966f6048bc 100644 --- a/client/src/app/site/pages/login/pages/unsupported-browser/unsupported-browser.module.ts +++ b/client/src/app/site/pages/login/pages/unsupported-browser/unsupported-browser.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatCardModule } from '@angular/material/card'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { UnsupportedBrowserComponent } from './components/unsupported-browser/unsupported-browser.component'; import { UnsupportedBrowserRoutingModule } from './unsupported-browser-routing.module'; diff --git a/client/src/app/site/pages/meetings/base/base-has-meeting-user-view-model.ts b/client/src/app/site/pages/meetings/base/base-has-meeting-user-view-model.ts index 37e587b8d0..0c1aec887d 100644 --- a/client/src/app/site/pages/meetings/base/base-has-meeting-user-view-model.ts +++ b/client/src/app/site/pages/meetings/base/base-has-meeting-user-view-model.ts @@ -1,6 +1,6 @@ +import { BaseModel } from '@app/domain/models/base/base-model'; +import { BaseViewModel } from '@app/site/base/base-view-model'; import { Observable } from 'rxjs'; -import { BaseModel } from 'src/app/domain/models/base/base-model'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; import { ViewMeetingUser } from '../view-models/view-meeting-user'; import { ViewUser } from '../view-models/view-user'; diff --git a/client/src/app/site/pages/meetings/base/base-meeting-controller.service.ts b/client/src/app/site/pages/meetings/base/base-meeting-controller.service.ts index e85c2fc651..4f34ee118a 100644 --- a/client/src/app/site/pages/meetings/base/base-meeting-controller.service.ts +++ b/client/src/app/site/pages/meetings/base/base-meeting-controller.service.ts @@ -1,11 +1,11 @@ import { Directive } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { BaseModel, ModelConstructor } from 'src/app/domain/models/base/base-model'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { BaseController } from 'src/app/site/base/base-controller'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; +import { Id } from '@app/domain/definitions/key-types'; +import { BaseModel, ModelConstructor } from '@app/domain/models/base/base-model'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { BaseController } from '@app/site/base/base-controller'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; import { ActiveMeetingService } from '../services/active-meeting.service'; import { ActiveMeetingIdService } from '../services/active-meeting-id.service'; diff --git a/client/src/app/site/pages/meetings/base/base-meeting-list-view.component.ts b/client/src/app/site/pages/meetings/base/base-meeting-list-view.component.ts index b487cb6cc6..713977664a 100644 --- a/client/src/app/site/pages/meetings/base/base-meeting-list-view.component.ts +++ b/client/src/app/site/pages/meetings/base/base-meeting-list-view.component.ts @@ -1,11 +1,11 @@ import { Directive, inject } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { BaseListViewComponent } from '@app/site/base/base-list-view.component'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; import { TranslateService } from '@ngx-translate/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { BaseListViewComponent } from 'src/app/site/base/base-list-view.component'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; import { ActiveMeetingService } from '../services/active-meeting.service'; import { MeetingComponentServiceCollectorService } from '../services/meeting-component-service-collector.service'; diff --git a/client/src/app/site/pages/meetings/base/base-meeting-model-request-handler.component.ts b/client/src/app/site/pages/meetings/base/base-meeting-model-request-handler.component.ts index e91bb3c28e..ed51cd302c 100644 --- a/client/src/app/site/pages/meetings/base/base-meeting-model-request-handler.component.ts +++ b/client/src/app/site/pages/meetings/base/base-meeting-model-request-handler.component.ts @@ -1,7 +1,7 @@ import { Directive } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfig } from 'src/app/domain/interfaces/subscription-config'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfig } from '@app/domain/interfaces/subscription-config'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; @Directive() export abstract class BaseMeetingModelRequestHandler extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/meetings/base/base-meeting.component.ts b/client/src/app/site/pages/meetings/base/base-meeting.component.ts index 51d1a55479..e9e2b6fdd1 100644 --- a/client/src/app/site/pages/meetings/base/base-meeting.component.ts +++ b/client/src/app/site/pages/meetings/base/base-meeting.component.ts @@ -1,7 +1,7 @@ import { Directive, inject } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { BaseComponent } from '@app/site/base/base.component'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; import { ActiveMeetingService } from '../services/active-meeting.service'; import { ActiveMeetingIdService } from '../services/active-meeting-id.service'; diff --git a/client/src/app/site/pages/meetings/meetings.config.ts b/client/src/app/site/pages/meetings/meetings.config.ts index b396be1946..bd95df6699 100644 --- a/client/src/app/site/pages/meetings/meetings.config.ts +++ b/client/src/app/site/pages/meetings/meetings.config.ts @@ -1,4 +1,4 @@ -import { MeetingRepositoryService } from 'src/app/gateways/repositories/meeting-repository.service'; +import { MeetingRepositoryService } from '@app/gateways/repositories/meeting-repository.service'; import { Meeting } from '../../../domain/models/meetings/meeting'; import { AppConfig } from '../../../infrastructure/definitions/app-config'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component.ts index c19c688409..6eb0ba01b8 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component.ts @@ -13,22 +13,22 @@ import { ViewEncapsulation } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Id } from '@app/domain/definitions/key-types'; +import { Selectable } from '@app/domain/interfaces/selectable'; +import { SpeakerState } from '@app/domain/models/speakers/speaker-state'; +import { SPECIAL_SPEECH_STATES, SpeechState } from '@app/domain/models/speakers/speech-state'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewListOfSpeakers, ViewSpeaker } from '@app/site/pages/meetings/pages/agenda'; +import { SpeakerControllerService } from '@app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service'; +import { InteractionService } from '@app/site/pages/meetings/pages/interaction/services/interaction.service'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; +import { SortingListComponent } from '@app/ui/modules/sorting/modules/sorting-list/components/sorting-list/sorting-list.component'; import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom, map, Observable, startWith } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Selectable } from 'src/app/domain/interfaces/selectable'; -import { SpeakerState } from 'src/app/domain/models/speakers/speaker-state'; -import { SPECIAL_SPEECH_STATES, SpeechState } from 'src/app/domain/models/speakers/speech-state'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewListOfSpeakers, ViewSpeaker } from 'src/app/site/pages/meetings/pages/agenda'; -import { SpeakerControllerService } from 'src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service'; -import { InteractionService } from 'src/app/site/pages/meetings/pages/interaction/services/interaction.service'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; -import { SortingListComponent } from 'src/app/ui/modules/sorting/modules/sorting-list/components/sorting-list/sorting-list.component'; import { UserSelectionData } from '../../../participant-search-selector'; import { ListOfSpeakersContentTitleDirective } from '../../directives/list-of-speakers-content-title.directive'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-entry/list-of-speakers-entry.component.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-entry/list-of-speakers-entry.component.ts index 947024b654..5714ad47c4 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-entry/list-of-speakers-entry.component.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-entry/list-of-speakers-entry.component.ts @@ -9,20 +9,20 @@ import { ViewChild, ViewEncapsulation } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { SpeakerState } from '@app/domain/models/speakers/speaker-state'; +import { SPECIAL_SPEECH_STATES, SpeechState } from '@app/domain/models/speakers/speech-state'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewSpeaker } from '@app/site/pages/meetings/pages/agenda'; +import { ListOfSpeakersControllerService } from '@app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service'; +import { SpeakerControllerService } from '@app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service'; +import { InteractionService } from '@app/site/pages/meetings/pages/interaction/services/interaction.service'; +import { DurationService } from '@app/site/services/duration.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; +import { SortingListComponent } from '@app/ui/modules/sorting/modules/sorting-list/components/sorting-list/sorting-list.component'; import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom, map, Observable, startWith } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { SpeakerState } from 'src/app/domain/models/speakers/speaker-state'; -import { SPECIAL_SPEECH_STATES, SpeechState } from 'src/app/domain/models/speakers/speech-state'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewSpeaker } from 'src/app/site/pages/meetings/pages/agenda'; -import { ListOfSpeakersControllerService } from 'src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service'; -import { SpeakerControllerService } from 'src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service'; -import { InteractionService } from 'src/app/site/pages/meetings/pages/interaction/services/interaction.service'; -import { DurationService } from 'src/app/site/services/duration.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; -import { SortingListComponent } from 'src/app/ui/modules/sorting/modules/sorting-list/components/sorting-list/sorting-list.component'; import { ViewMeetingUser } from '../../../../view-models/view-meeting-user'; import { CountdownData } from '../../../projector/modules/countdown-time/countdown-time.component'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/moderation-note/moderation-note.component.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/moderation-note/moderation-note.component.ts index c804cfc9b2..19f45caaa2 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/moderation-note/moderation-note.component.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/moderation-note/moderation-note.component.ts @@ -9,14 +9,14 @@ import { ViewEncapsulation } from '@angular/core'; import { FormBuilder, UntypedFormGroup } from '@angular/forms'; +import { Permission } from '@app/domain/definitions/permission'; +import { ListOfSpeakersRepositoryService } from '@app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewListOfSpeakers } from '@app/site/pages/meetings/pages/agenda'; +import { OperatorService } from '@app/site/services/operator.service'; import { TranslateService } from '@ngx-translate/core'; import { map, Observable } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { ListOfSpeakersRepositoryService } from 'src/app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewListOfSpeakers } from 'src/app/site/pages/meetings/pages/agenda'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { ListOfSpeakersContentTitleDirective } from '../../directives/list-of-speakers-content-title.directive'; import { ModerationNotePdfService } from '../../services/moderation-note-pdf.service/moderation-note-pdf.service'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component.spec.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component.spec.ts index a8718b3ac4..38c2d5c76d 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component.spec.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component.spec.ts @@ -1,5 +1,5 @@ // import { ComponentFixture, TestBed } from '@angular/core/testing'; -// import { BaseViewModel } from 'src/app/site/base/base-view-model'; +// import { BaseViewModel } from '@app/site/base/base-view-model'; // import { E2EImportsModule } from 'src/e2e-imports.module'; // import { PollModule } from '../../../../modules/poll'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component.ts index ed81ebd992..151dc27538 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component.ts @@ -9,18 +9,18 @@ import { } from '@angular/core'; import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { SpeechState } from '@app/domain/models/speakers/speech-state'; +import { SpeakerRepositoryService } from '@app/gateways/repositories/speakers/speaker-repository.service'; +import { StructureLevelListOfSpeakersRepositoryService } from '@app/gateways/repositories/structure-level-list-of-speakers'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { ViewListOfSpeakers, ViewSpeaker } from '@app/site/pages/meetings/pages/agenda'; +import { DurationService } from '@app/site/services/duration.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { filter, merge, mergeMap, Subscription, tap } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { SpeechState } from 'src/app/domain/models/speakers/speech-state'; -import { SpeakerRepositoryService } from 'src/app/gateways/repositories/speakers/speaker-repository.service'; -import { StructureLevelListOfSpeakersRepositoryService } from 'src/app/gateways/repositories/structure-level-list-of-speakers'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { ViewListOfSpeakers, ViewSpeaker } from 'src/app/site/pages/meetings/pages/agenda'; -import { DurationService } from 'src/app/site/services/duration.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { CurrentSpeakingStructureLevelSlideService } from '../../../../pages/agenda/modules/list-of-speakers/services/current-speaking-structure-level-slide.service'; import { CurrentStructureLevelListSlideService } from '../../../../pages/agenda/modules/list-of-speakers/services/current-structure-level-list-slide.service'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts index 2535b5ee4d..912760ca0c 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.module.ts @@ -12,12 +12,12 @@ import { MatListModule } from '@angular/material/list'; import { MatMenuModule } from '@angular/material/menu'; import { MatTableModule } from '@angular/material/table'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { SpeakingTimesComponent } from 'src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { EditorModule } from 'src/app/ui/modules/editor'; -import { SortingListModule } from 'src/app/ui/modules/sorting/modules/sorting-list/sorting-list.module'; -import { PipesModule } from 'src/app/ui/pipes'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { SpeakingTimesComponent } from '@app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component'; +import { DirectivesModule } from '@app/ui/directives'; +import { EditorModule } from '@app/ui/modules/editor'; +import { SortingListModule } from '@app/ui/modules/sorting/modules/sorting-list/sorting-list.module'; +import { PipesModule } from '@app/ui/pipes'; import { ParticipantCommonServiceModule } from '../../pages/participants/services/common/participant-common-service.module'; import { MeetingExportModule } from '../../services/export'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.subscription.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.subscription.ts index 3fa1bb571c..02f5ef4029 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.subscription.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/list-of-speakers-content.subscription.ts @@ -1,5 +1,5 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; import { ViewMeeting } from '../../view-models/view-meeting'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/components/point-of-order-dialog/point-of-order-dialog.component.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/components/point-of-order-dialog/point-of-order-dialog.component.ts index 277d460451..6891982af6 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/components/point-of-order-dialog/point-of-order-dialog.component.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/components/point-of-order-dialog/point-of-order-dialog.component.ts @@ -1,10 +1,10 @@ -import { Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { ViewPointOfOrderCategory } from '@app/site/pages/meetings/pages/agenda'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; import { BehaviorSubject, combineLatest, map } from 'rxjs'; -import { ViewPointOfOrderCategory } from 'src/app/site/pages/meetings/pages/agenda'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; import { PointOfOrderData } from '../../services/point-of-order-dialog.service'; @@ -12,6 +12,7 @@ import { PointOfOrderData } from '../../services/point-of-order-dialog.service'; selector: `os-point-of-order-dialog`, templateUrl: `./point-of-order-dialog.component.html`, styleUrls: [`./point-of-order-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class PointOfOrderDialogComponent { diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/point-of-order-dialog.module.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/point-of-order-dialog.module.ts index 513b73dec3..1f05e511e9 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/point-of-order-dialog.module.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/point-of-order-dialog.module.ts @@ -6,7 +6,7 @@ import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { PointOfOrderDialogComponent } from './components/point-of-order-dialog/point-of-order-dialog.component'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/services/point-of-order-dialog.service.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/services/point-of-order-dialog.service.ts index 1a9c3c3047..6fc97bda8b 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/services/point-of-order-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/services/point-of-order-dialog.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { Id } from '@app/domain/definitions/key-types'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { PointOfOrderDialogComponent } from '../components/point-of-order-dialog/point-of-order-dialog.component'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/components/speaker-user-select-dialog/speaker-user-select-dialog.component.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/components/speaker-user-select-dialog/speaker-user-select-dialog.component.ts index 6b233d3653..be9ac452d8 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/components/speaker-user-select-dialog/speaker-user-select-dialog.component.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/components/speaker-user-select-dialog/speaker-user-select-dialog.component.ts @@ -1,9 +1,9 @@ -import { Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { SpeechState } from 'src/app/domain/models/speakers/speech-state'; -import { UserRepositoryService } from 'src/app/gateways/repositories/users'; -import { getSpeakerVerboseState, ViewListOfSpeakers } from 'src/app/site/pages/meetings/pages/agenda'; +import { Id } from '@app/domain/definitions/key-types'; +import { SpeechState } from '@app/domain/models/speakers/speech-state'; +import { UserRepositoryService } from '@app/gateways/repositories/users'; +import { getSpeakerVerboseState, ViewListOfSpeakers } from '@app/site/pages/meetings/pages/agenda'; import { UserSelectionData } from '../../../../../participant-search-selector'; @@ -17,6 +17,7 @@ interface SpeakerUserSelectDialogComponentData { selector: `os-speaker-user-select-dialog`, templateUrl: `./speaker-user-select-dialog.component.html`, styleUrls: [`./speaker-user-select-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class SpeakerUserSelectDialogComponent { diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/services/speaker-user-select-dialog.service.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/services/speaker-user-select-dialog.service.ts index f3394b13f3..5dad911676 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/services/speaker-user-select-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/services/speaker-user-select-dialog.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { SpeechState } from 'src/app/domain/models/speakers/speech-state'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { ViewListOfSpeakers } from 'src/app/site/pages/meetings/pages/agenda'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { Id } from '@app/domain/definitions/key-types'; +import { SpeechState } from '@app/domain/models/speakers/speech-state'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { ViewListOfSpeakers } from '@app/site/pages/meetings/pages/agenda'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { SpeakerUserSelectDialogComponent } from '../components/speaker-user-select-dialog/speaker-user-select-dialog.component'; import { SpeakerUserSelectDialogModule } from '../speaker-user-select-dialog.module'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/speaker-user-select-dialog.module.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/speaker-user-select-dialog.module.ts index 30f479ca12..aafbabfbb4 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/speaker-user-select-dialog.module.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/speaker-user-select-dialog.module.ts @@ -4,7 +4,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatSelectModule } from '@angular/material/select'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { ParticipantSearchSelectorModule } from '../../../participant-search-selector'; import { SpeakerUserSelectDialogComponent } from './components/speaker-user-select-dialog/speaker-user-select-dialog.component'; diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/services/moderation-note-pdf.service/moderation-note-pdf.service.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/services/moderation-note-pdf.service/moderation-note-pdf.service.ts index cf801513b4..f273d31716 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/services/moderation-note-pdf.service/moderation-note-pdf.service.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/services/moderation-note-pdf.service/moderation-note-pdf.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; +import { HtmlToPdfService } from '@app/gateways/export/html-to-pdf.service'; +import { MeetingPdfExportService } from '@app/site/pages/meetings/services/export'; import { TranslateService } from '@ngx-translate/core'; import { Content, ContentText } from 'pdfmake/interfaces'; -import { HtmlToPdfService } from 'src/app/gateways/export/html-to-pdf.service'; -import { MeetingPdfExportService } from 'src/app/site/pages/meetings/services/export'; /** * Creates a PDF document from a single tpoic diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module.ts index 6b9788a346..88a80c4f20 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module.ts @@ -4,9 +4,9 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatSelectModule } from '@angular/material/select'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; import { AgendaContentObjectFormComponent } from './components/agenda-content-object-form/agenda-content-object-form.component'; import { AgendaContentObjectFormService } from './services/agenda-content-object-form.service'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/components/agenda-content-object-form/agenda-content-object-form.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/components/agenda-content-object-form/agenda-content-object-form.component.ts index baace53397..abe72efa3d 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/components/agenda-content-object-form/agenda-content-object-form.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/components/agenda-content-object-form/agenda-content-object-form.component.ts @@ -1,13 +1,13 @@ -import { AfterViewInit, Component, Input, OnDestroy } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, Input, OnDestroy } from '@angular/core'; import { AbstractControl, UntypedFormGroup } from '@angular/forms'; +import { Permission } from '@app/domain/definitions/permission'; +import { SubscriptionConfig } from '@app/domain/interfaces/subscription-config'; +import { ItemTypeChoices } from '@app/domain/models/agenda/agenda-item'; +import { BaseMeetingModelRequestHandler } from '@app/site/pages/meetings/base/base-meeting-model-request-handler.component'; +import { ViewAgendaItem } from '@app/site/pages/meetings/pages/agenda'; +import { getAgendaListMinimalSubscriptionConfig } from '@app/site/pages/meetings/pages/agenda/agenda.subscription'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; import { BehaviorSubject, map, Observable, Subscription } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { SubscriptionConfig } from 'src/app/domain/interfaces/subscription-config'; -import { ItemTypeChoices } from 'src/app/domain/models/agenda/agenda-item'; -import { BaseMeetingModelRequestHandler } from 'src/app/site/pages/meetings/base/base-meeting-model-request-handler.component'; -import { ViewAgendaItem } from 'src/app/site/pages/meetings/pages/agenda'; -import { getAgendaListMinimalSubscriptionConfig } from 'src/app/site/pages/meetings/pages/agenda/agenda.subscription'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; import { AgendaContentObjectFormService } from '../../services/agenda-content-object-form.service'; @@ -15,6 +15,7 @@ import { AgendaContentObjectFormService } from '../../services/agenda-content-ob selector: `os-agenda-content-object-form`, templateUrl: `./agenda-content-object-form.component.html`, styleUrls: [`./agenda-content-object-form.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AgendaContentObjectFormComponent diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/services/agenda-content-object-form.service.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/services/agenda-content-object-form.service.ts index 288be6073a..0b9c4e002c 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/services/agenda-content-object-form.service.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/services/agenda-content-object-form.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; +import { AgendaItemRepositoryService } from '@app/gateways/repositories/agenda'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; import { Observable } from 'rxjs'; -import { AgendaItemRepositoryService } from 'src/app/gateways/repositories/agenda'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; import { ViewAgendaItem } from '../../../../pages/agenda'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/attachment-control.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/attachment-control.module.ts index ab1dd261cf..907bd24b25 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/attachment-control.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/attachment-control.module.ts @@ -5,11 +5,11 @@ import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { MediaUploadContentComponent } from 'src/app/ui/modules/media-upload-content/media-upload-content.component'; -import { ScrollingTableModule } from 'src/app/ui/modules/scrolling-table'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { MediaUploadContentComponent } from '@app/ui/modules/media-upload-content/media-upload-content.component'; +import { ScrollingTableModule } from '@app/ui/modules/scrolling-table'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; import { MediafileCommonServiceModule } from '../../../pages/mediafiles/services/mediafile-common-service.module'; import { AttachmentControlComponent } from './components/attachment-control/attachment-control.component'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.ts index ed6443b978..d577705a20 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.ts @@ -10,20 +10,20 @@ import { } from '@angular/core'; import { NG_VALUE_ACCESSOR, UntypedFormControl, UntypedFormGroup } from '@angular/forms'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; -import { map, Observable, OperatorFunction } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { ViewMediafile } from 'src/app/site/pages/meetings/pages/mediafiles'; +import { Permission } from '@app/domain/definitions/permission'; +import { Identifiable } from '@app/domain/interfaces'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { ViewMediafile } from '@app/site/pages/meetings/pages/mediafiles'; import { getMediafilesListMinimalSubscriptionConfig, MEDIAFILES_LIST_MINIMAL_SUBSCRIPTION -} from 'src/app/site/pages/meetings/pages/mediafiles/mediafiles.subscription'; -import { MediafileControllerService } from 'src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service'; -import { GroupControllerService, ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { ModelRequestService } from 'src/app/site/services/model-request.service'; -import { BaseFormControlComponent } from 'src/app/ui/base/base-form-control'; +} from '@app/site/pages/meetings/pages/mediafiles/mediafiles.subscription'; +import { MediafileControllerService } from '@app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service'; +import { GroupControllerService, ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { ModelRequestService } from '@app/site/services/model-request.service'; +import { BaseFormControlComponent } from '@app/ui/base/base-form-control'; +import { map, Observable, OperatorFunction } from 'rxjs'; @Component({ selector: `os-attachment-control`, diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/detail-view-navigator/detail-view-navigator.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/detail-view-navigator/detail-view-navigator.component.ts index add201e978..54e9be487b 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/detail-view-navigator/detail-view-navigator.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/detail-view-navigator/detail-view-navigator.component.ts @@ -1,11 +1,12 @@ -import { Component, Input } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { DetailNavigable, isDetailNavigable } from 'src/app/domain/interfaces/detail-navigable'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { Identifiable } from '@app/domain/interfaces'; +import { DetailNavigable, isDetailNavigable } from '@app/domain/interfaces/detail-navigable'; @Component({ selector: `os-detail-view-navigator`, templateUrl: `./detail-view-navigator.component.html`, styleUrls: [`./detail-view-navigator.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class DetailViewNavigatorComponent { diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/detail-view-not-found/detail-view-not-found.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/detail-view-not-found/detail-view-not-found.component.ts index db764040c4..90341c2242 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/detail-view-not-found/detail-view-not-found.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/detail-view-not-found/detail-view-not-found.component.ts @@ -1,9 +1,10 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; @Component({ selector: `os-detail-view-not-found`, templateUrl: `./detail-view-not-found.component.html`, styleUrls: [`./detail-view-not-found.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class DetailViewNotFoundComponent {} diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/detail-view/detail-view.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/detail-view/detail-view.component.ts index ec05cca490..31757d3970 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/detail-view/detail-view.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/detail-view/detail-view.component.ts @@ -8,12 +8,12 @@ import { Output } from '@angular/core'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; +import { Collection, Id } from '@app/domain/definitions/key-types'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { SequentialNumberMappingService } from '@app/site/pages/meetings/services/sequential-number-mapping.service'; import { _ } from '@ngx-translate/core'; import { filter, firstValueFrom, Subscription } from 'rxjs'; -import { Collection, Id } from 'src/app/domain/definitions/key-types'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { SequentialNumberMappingService } from 'src/app/site/pages/meetings/services/sequential-number-mapping.service'; const ROUTE_SUBSCRIPTION_NAME = `routeSubscription`; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/easter-egg/easter-egg.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/easter-egg/easter-egg.component.ts index 839a0c3507..72ec1d3f91 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/easter-egg/easter-egg.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/easter-egg/easter-egg.component.ts @@ -1,10 +1,11 @@ -import { Component } from '@angular/core'; -import { isEasterEggTime } from 'src/app/infrastructure/utils'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { isEasterEggTime } from '@app/infrastructure/utils'; @Component({ selector: `os-easter-egg`, templateUrl: `./easter-egg.component.html`, styleUrls: [`./easter-egg.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class EasterEggComponent { diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/projectable-title/projectable-title.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/projectable-title/projectable-title.component.ts index 2900d00303..48e63c2d95 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/projectable-title/projectable-title.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/projectable-title/projectable-title.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, ViewEncapsulation } from '@angular/core'; +import { ProjectorControllerService } from '@app/site/pages/meetings/pages/projectors/services/projector-controller.service'; +import { BaseProjectableViewModel } from '@app/site/pages/meetings/view-models'; import { distinctUntilChanged, map } from 'rxjs'; -import { ProjectorControllerService } from 'src/app/site/pages/meetings/pages/projectors/services/projector-controller.service'; -import { BaseProjectableViewModel } from 'src/app/site/pages/meetings/view-models'; @Component({ selector: `os-projectable-title`, diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/detail-view.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/detail-view.module.ts index bc0d08d0eb..3ccaef43fa 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/detail-view.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/detail-view.module.ts @@ -5,8 +5,8 @@ import { MatIconModule } from '@angular/material/icon'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; import { DetailViewComponent } from './components/detail-view/detail-view.component'; import { DetailViewNavigatorComponent } from './components/detail-view-navigator/detail-view-navigator.component'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/components/projectable-list/projectable-list.component.spec.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/components/projectable-list/projectable-list.component.spec.ts index 708b77c02d..62ad095685 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/components/projectable-list/projectable-list.component.spec.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/components/projectable-list/projectable-list.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; +import { BaseViewModel } from '@app/site/base/base-view-model'; import { ProjectableListComponent } from './projectable-list.component'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/components/projectable-list/projectable-list.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/components/projectable-list/projectable-list.component.ts index 89ee2cf380..105efba55f 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/components/projectable-list/projectable-list.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/components/projectable-list/projectable-list.component.ts @@ -1,18 +1,15 @@ import { ChangeDetectionStrategy, Component, Input, ViewChild } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { HasListOfSpeakers, hasListOfSpeakers } from '@app/site/pages/meetings/pages/agenda'; +import { InteractionService } from '@app/site/pages/meetings/pages/interaction/services/interaction.service'; +import { BaseProjectableViewModel } from '@app/site/pages/meetings/view-models/base-projectable-model'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ColumnRestriction, ListComponent } from '@app/ui/modules/list'; +import { BaseListComponent } from '@app/ui/modules/list/base/base-list.component'; +import { ViewListComponent } from '@app/ui/modules/list/components/view-list/view-list.component'; +import { END_POSITION, START_POSITION } from '@app/ui/modules/scrolling-table/directives/scrolling-table-cell-position'; import { map, Observable } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { HasListOfSpeakers, hasListOfSpeakers } from 'src/app/site/pages/meetings/pages/agenda'; -import { InteractionService } from 'src/app/site/pages/meetings/pages/interaction/services/interaction.service'; -import { BaseProjectableViewModel } from 'src/app/site/pages/meetings/view-models/base-projectable-model'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ColumnRestriction, ListComponent } from 'src/app/ui/modules/list'; -import { BaseListComponent } from 'src/app/ui/modules/list/base/base-list.component'; -import { ViewListComponent } from 'src/app/ui/modules/list/components/view-list/view-list.component'; -import { - END_POSITION, - START_POSITION -} from 'src/app/ui/modules/scrolling-table/directives/scrolling-table-cell-position'; import { ProjectableListService } from '../../services/projectable-list.service'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/projectable-list.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/projectable-list.module.ts index de875ab75d..84d45bb2fd 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/projectable-list.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/projectable-list.module.ts @@ -2,9 +2,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ListModule } from 'src/app/ui/modules/list'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { ListModule } from '@app/ui/modules/list'; import { ProjectorButtonModule } from '../projector-button/projector-button.module'; import { SpeakerButtonModule } from '../speaker-button/speaker-button.module'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/services/projectable-list.service.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/services/projectable-list.service.ts index 1600c28c4a..aa1210a558 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/services/projectable-list.service.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/services/projectable-list.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { isProjectable, Projectable, ProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { isProjectable, Projectable, ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models'; @Injectable() export class ProjectableListService { diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/components/projection-dialog/projection-dialog.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/components/projection-dialog/projection-dialog.component.ts index e89c2cae84..a2601059c3 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/components/projection-dialog/projection-dialog.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/components/projection-dialog/projection-dialog.component.ts @@ -1,19 +1,18 @@ -import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; +import { Id } from '@app/domain/definitions/key-types'; +import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; import { getProjectorListMinimalSubscriptionConfig, PROJECTOR_LIST_MINIMAL_SUBSCRIPTION -} from 'src/app/site/pages/meetings/pages/projectors/projectors.subscription'; -import { ProjectorControllerService } from 'src/app/site/pages/meetings/pages/projectors/services/projector-controller.service'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; +} from '@app/site/pages/meetings/pages/projectors/projectors.subscription'; +import { ProjectorControllerService } from '@app/site/pages/meetings/pages/projectors/services/projector-controller.service'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; import { isProjectionBuildDescriptor, MultiProjectionBuildDescriptor, ProjectionBuildDescriptor -} from 'src/app/site/pages/meetings/view-models/projection-build-descriptor'; +} from '@app/site/pages/meetings/view-models/projection-build-descriptor'; import { isSlideChoiceOption, isSlideDecisionOption, @@ -21,8 +20,9 @@ import { SlideDecisionOption, SlideOption, SlideOptions -} from 'src/app/site/pages/meetings/view-models/slide-options'; -import { ModelRequestService } from 'src/app/site/services/model-request.service'; +} from '@app/site/pages/meetings/view-models/slide-options'; +import { ModelRequestService } from '@app/site/services/model-request.service'; +import { Subscription } from 'rxjs'; import { ProjectionDialogReturnType } from '../../definitions'; @@ -37,6 +37,7 @@ export interface ProjectionDialogConfig { selector: `os-projection-dialog`, templateUrl: `./projection-dialog.component.html`, styleUrls: [`./projection-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ProjectionDialogComponent implements OnInit, OnDestroy { diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/definitions.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/definitions.ts index 99160a52cf..7e538579af 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/definitions.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/definitions.ts @@ -1,5 +1,5 @@ -import { ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; -import { MultiProjectionBuildDescriptor, ProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models'; +import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; +import { MultiProjectionBuildDescriptor, ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models'; export interface ProjectionDialogReturnType { action: `project` | `bulkAddToPreview` | `addToPreview` | `hide`; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/projection-dialog.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/projection-dialog.module.ts index 6628ac7492..6f7e9954cc 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/projection-dialog.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/projection-dialog.module.ts @@ -8,8 +8,8 @@ import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatRadioModule } from '@angular/material/radio'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; import { ProjectionDialogComponent } from './components/projection-dialog/projection-dialog.component'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.ts index 3bd5ffec18..facb88e6c2 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { firstValueFrom } from 'rxjs'; -import { ProjectorControllerService } from 'src/app/site/pages/meetings/pages/projectors/services/projector-controller.service'; +import { ProjectorControllerService } from '@app/site/pages/meetings/pages/projectors/services/projector-controller.service'; import { isMultiProjectionBuildDescriptor, isProjectionBuildDescriptor, MultiProjectionBuildDescriptor, ProjectionBuildDescriptor -} from 'src/app/site/pages/meetings/view-models'; +} from '@app/site/pages/meetings/view-models'; +import { firstValueFrom } from 'rxjs'; import { ProjectionDialogComponent, diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.ts index f2a7a19d51..203cf4e201 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/components/projector-button/projector-button.component.ts @@ -1,9 +1,8 @@ -import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; -import { distinctUntilChanged, Subscription } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { ProjectionDialogService } from 'src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service'; -import { ViewProjection, ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; -import { ProjectorControllerService } from 'src/app/site/pages/meetings/pages/projectors/services/projector-controller.service'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; +import { ProjectionDialogService } from '@app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service'; +import { ViewProjection, ViewProjector } from '@app/site/pages/meetings/pages/projectors'; +import { ProjectorControllerService } from '@app/site/pages/meetings/pages/projectors/services/projector-controller.service'; import { isMultiProjectionBuildDescriptor, isProjectable, @@ -11,12 +10,14 @@ import { MultiProjectionBuildDescriptor, Projectable, ProjectionBuildDescriptor -} from 'src/app/site/pages/meetings/view-models'; +} from '@app/site/pages/meetings/view-models'; +import { distinctUntilChanged, Subscription } from 'rxjs'; @Component({ selector: `os-projector-button`, templateUrl: `./projector-button.component.html`, styleUrls: [`./projector-button.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ProjectorButtonComponent implements OnInit, OnDestroy { diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/projector-button.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/projector-button.module.ts index 0ea295bcb8..19eb69e527 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/projector-button.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projector-button/projector-button.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; import { ProjectionDialogModule } from '../projection-dialog/projection-dialog.module'; import { ProjectorButtonComponent } from './components/projector-button/projector-button.component'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/speaker-button/components/speaker-button/speaker-button.component.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/speaker-button/components/speaker-button/speaker-button.component.ts index 0b19f11ab6..8a38cf16d4 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/speaker-button/components/speaker-button/speaker-button.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/speaker-button/components/speaker-button/speaker-button.component.ts @@ -1,9 +1,9 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { HasListOfSpeakers, ViewListOfSpeakers } from '@app/site/pages/meetings/pages/agenda'; +import { OperatorService } from '@app/site/services/operator.service'; import { distinctUntilChanged, Observable, of, Subscription } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { HasListOfSpeakers, ViewListOfSpeakers } from 'src/app/site/pages/meetings/pages/agenda'; -import { OperatorService } from 'src/app/site/services/operator.service'; @Component({ selector: `os-speaker-button`, diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/speaker-button/speaker-button.module.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/speaker-button/speaker-button.module.ts index 9005394738..c405efb5e7 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/speaker-button/speaker-button.module.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/speaker-button/speaker-button.module.ts @@ -6,8 +6,8 @@ import { MatChipsModule } from '@angular/material/chips'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; import { DetailViewModule } from '../detail-view/detail-view.module'; import { SpeakerButtonComponent } from './components/speaker-button/speaker-button.component'; diff --git a/client/src/app/site/pages/meetings/modules/meetings-navigation/meetings-navigation-wrapper.component.ts b/client/src/app/site/pages/meetings/modules/meetings-navigation/meetings-navigation-wrapper.component.ts index f97003d5a0..05aa11fc36 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-navigation/meetings-navigation-wrapper.component.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-navigation/meetings-navigation-wrapper.component.ts @@ -1,24 +1,24 @@ import { CommonModule } from '@angular/common'; -import { Component, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core'; import { MatBadgeModule } from '@angular/material/badge'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { NavigationEnd, RouterModule } from '@angular/router'; +import { NotifyService } from '@app/gateways/notify.service'; +import { navItemAnim } from '@app/infrastructure/animations'; +import { getCustomStyleForEntry } from '@app/site/base/base-menu-entry'; +import { GlobalHeadbarModule } from '@app/site/modules/global-headbar'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { MainMenuEntry, MainMenuService } from '@app/site/pages/meetings/services/main-menu.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { DirectivesModule } from '@app/ui/directives'; +import { SidenavModule } from '@app/ui/modules/sidenav'; +import { SidenavComponent } from '@app/ui/modules/sidenav/components/sidenav/sidenav.component'; import { TranslatePipe } from '@ngx-translate/core'; import { Observable, Subscription } from 'rxjs'; -import { NotifyService } from 'src/app/gateways/notify.service'; -import { navItemAnim } from 'src/app/infrastructure/animations'; -import { getCustomStyleForEntry } from 'src/app/site/base/base-menu-entry'; -import { GlobalHeadbarModule } from 'src/app/site/modules/global-headbar'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { MainMenuEntry, MainMenuService } from 'src/app/site/pages/meetings/services/main-menu.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { SidenavModule } from 'src/app/ui/modules/sidenav'; -import { SidenavComponent } from 'src/app/ui/modules/sidenav/components/sidenav/sidenav.component'; import { ChatNotificationService, ChatService } from '../../pages/chat'; import { InteractionModule } from '../../pages/interaction/interaction.module'; @@ -29,6 +29,7 @@ import { LoadFontService } from '../../services/load-font.service'; templateUrl: `./meetings-navigation-wrapper.component.html`, styleUrls: [`./meetings-navigation-wrapper.component.scss`], animations: [navItemAnim], + changeDetection: ChangeDetectionStrategy.Eager, imports: [ CommonModule, SidenavModule, diff --git a/client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.ts b/client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.ts index bcb9a62f31..495f874da3 100644 --- a/client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.ts +++ b/client/src/app/site/pages/meetings/modules/participant-search-selector/components/participant-search-selector/participant-search-selector.component.ts @@ -1,11 +1,11 @@ -import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Permission } from '@app/domain/definitions/permission'; +import { ModelRequestService } from '@app/site/services/model-request.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, filter, firstValueFrom } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { ModelRequestService } from 'src/app/site/services/model-request.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { ParticipantListSortService } from '../../../../pages/participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service'; import { @@ -21,6 +21,7 @@ import { UserSelectionData } from '../..'; selector: `os-participant-search-selector`, templateUrl: `./participant-search-selector.component.html`, styleUrls: [`./participant-search-selector.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ParticipantSearchSelectorComponent extends BaseUiComponent implements OnInit, OnDestroy { diff --git a/client/src/app/site/pages/meetings/modules/participant-search-selector/index.ts b/client/src/app/site/pages/meetings/modules/participant-search-selector/index.ts index fda133e025..0f72883b3e 100644 --- a/client/src/app/site/pages/meetings/modules/participant-search-selector/index.ts +++ b/client/src/app/site/pages/meetings/modules/participant-search-selector/index.ts @@ -1,4 +1,4 @@ -import { RawUser } from 'src/app/gateways/repositories/users'; +import { RawUser } from '@app/gateways/repositories/users'; export * from './participant-search-selector.module'; diff --git a/client/src/app/site/pages/meetings/modules/participant-search-selector/participant-search-selector.module.ts b/client/src/app/site/pages/meetings/modules/participant-search-selector/participant-search-selector.module.ts index 13d6dccbad..9fe9224d2d 100644 --- a/client/src/app/site/pages/meetings/modules/participant-search-selector/participant-search-selector.module.ts +++ b/client/src/app/site/pages/meetings/modules/participant-search-selector/participant-search-selector.module.ts @@ -3,9 +3,9 @@ import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; import { ParticipantSearchSelectorComponent } from './components/participant-search-selector/participant-search-selector.component'; diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-detail.component.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-detail.component.ts index 05dac00f44..f59c838067 100644 --- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-detail.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-detail.component.ts @@ -1,21 +1,21 @@ import { ChangeDetectorRef, Directive, inject, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { PollContentObject } from '@app/domain/models/poll'; +import { MeetingUserRepositoryService } from '@app/gateways/repositories/meeting_user'; +import { Deferred } from '@app/infrastructure/utils/promises'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { PollControllerService } from '@app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OperatorService } from '@app/site/services/operator.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; +import { ScrollingTableManageService } from '@app/ui/modules/scrolling-table'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; import { filter, map } from 'rxjs/operators'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { PollContentObject } from 'src/app/domain/models/poll'; -import { MeetingUserRepositoryService } from 'src/app/gateways/repositories/meeting_user'; -import { Deferred } from 'src/app/infrastructure/utils/promises'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { PollControllerService } from 'src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; -import { ScrollingTableManageService } from 'src/app/ui/modules/scrolling-table'; import { GroupControllerService } from '../../../pages/participants/modules/groups/services/group-controller.service'; import { EntitledUsersTableEntry } from '../definitions'; diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts index 0cc65eb09e..c1b4b53341 100644 --- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component.ts @@ -1,10 +1,9 @@ import { Directive, Inject, inject, OnInit, ViewChild } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { BehaviorSubject, distinctUntilChanged } from 'rxjs'; -import { Fqid, Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { BaseModel } from 'src/app/domain/models/base/base-model'; +import { Fqid, Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { BaseModel } from '@app/domain/models/base/base-model'; import { FormPollMethod, LOWEST_VOTE_VALUE, @@ -15,11 +14,12 @@ import { VoteKey, VoteValue, VoteValueVerbose -} from 'src/app/domain/models/poll'; -import { Option } from 'src/app/domain/models/poll/option'; -import { OneOfValidator } from 'src/app/site/modules/user-components'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; +} from '@app/domain/models/poll'; +import { Option } from '@app/domain/models/poll/option'; +import { OneOfValidator } from '@app/site/modules/user-components'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; +import { BehaviorSubject, distinctUntilChanged } from 'rxjs'; import { BasePollFormComponent } from '../components/base-poll-form/base-poll-form.component'; diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service.ts index 387e80643d..eb84a9e95c 100644 --- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service.ts @@ -1,12 +1,12 @@ import { ComponentType } from '@angular/cdk/portal'; import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; +import { PollContentObject } from '@app/domain/models/poll'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { PollDialogData, PollDialogResult } from '@app/site/pages/meetings/modules/poll/definitions'; +import { PollControllerService } from '@app/site/pages/meetings/modules/poll/services/poll-controller.service'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; import { firstValueFrom } from 'rxjs'; -import { PollContentObject } from 'src/app/domain/models/poll'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { PollDialogData, PollDialogResult } from 'src/app/site/pages/meetings/modules/poll/definitions'; -import { PollControllerService } from 'src/app/site/pages/meetings/modules/poll/services/poll-controller.service'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; @Injectable({ providedIn: 'root' }) export abstract class BasePollDialogService { diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component.ts index 3de59e2616..427d5d7a05 100644 --- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component.ts @@ -1,6 +1,6 @@ import { Directive, Input } from '@angular/core'; -import { PollBackendDurationChoices } from 'src/app/domain/models/poll/poll-constants'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; +import { PollBackendDurationChoices } from '@app/domain/models/poll/poll-constants'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; @Directive() export abstract class BasePollMetaInformationComponent { diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-pdf.service.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-pdf.service.ts index f7fb6063b5..8ad78f4640 100644 --- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-pdf.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-pdf.service.ts @@ -1,16 +1,16 @@ import { Directive, inject } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { BallotPaperSelection } from '@app/domain/models/meetings/meeting.constants'; +import { PollMethod, PollTableData, PollType, VoteValuesVerbose, VotingResult } from '@app/domain/models/poll'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; +import { ViewOption, ViewPoll } from '@app/site/pages/meetings/pages/polls'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { MeetingPdfExportService } from '@app/site/pages/meetings/services/export'; +import { MediaManageService } from '@app/site/pages/meetings/services/media-manage.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; import { TranslateService } from '@ngx-translate/core'; import { Content, ContentText, StyleDictionary, TDocumentDefinitions } from 'pdfmake/interfaces'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { BallotPaperSelection } from 'src/app/domain/models/meetings/meeting.constants'; -import { PollMethod, PollTableData, PollType, VoteValuesVerbose, VotingResult } from 'src/app/domain/models/poll'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; -import { ViewOption, ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { MeetingPdfExportService } from 'src/app/site/pages/meetings/services/export'; -import { MediaManageService } from 'src/app/site/pages/meetings/services/media-manage.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; import { ViewAssignment } from '../../../pages/assignments'; import { ViewUser } from '../../../view-models/view-user'; diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll.component.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll.component.ts index 40c8dd79f9..24af896c11 100644 --- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll.component.ts @@ -1,13 +1,13 @@ import { Directive, inject } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { PollContentObject } from '@app/domain/models/poll'; +import { PollState, PollType } from '@app/domain/models/poll/poll-constants'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; +import { ChoiceService } from '@app/ui/modules/choice-dialog'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { PollContentObject } from 'src/app/domain/models/poll'; -import { PollState, PollType } from 'src/app/domain/models/poll/poll-constants'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; -import { ChoiceService } from 'src/app/ui/modules/choice-dialog'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { PollControllerService } from '../services/poll-controller.service/poll-controller.service'; diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts index 9cfd09900b..ccc8736dfb 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component.ts @@ -7,7 +7,6 @@ import { ValidatorFn, Validators } from '@angular/forms'; -import { combineLatest, distinctUntilChanged, map, Observable, startWith } from 'rxjs'; import { FormPollMethod, PollBackendDurationChoices, @@ -19,10 +18,11 @@ import { PollPropertyVerboseKey, PollType, PollTypeVerbose -} from 'src/app/domain/models/poll'; -import { isNumberRange } from 'src/app/infrastructure/utils/validators'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { ParentErrorStateMatcher } from 'src/app/ui/modules/search-selector/validators'; +} from '@app/domain/models/poll'; +import { isNumberRange } from '@app/infrastructure/utils/validators'; +import { BaseComponent } from '@app/site/base/base.component'; +import { ParentErrorStateMatcher } from '@app/ui/modules/search-selector/validators'; +import { combineLatest, distinctUntilChanged, map, Observable, startWith } from 'rxjs'; import { GroupControllerService, ViewGroup } from '../../../../pages/participants'; import { ViewPoll } from '../../../../pages/polls'; diff --git a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.ts index a4241c3f3e..7f189a5b19 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.ts @@ -1,8 +1,6 @@ import { ChangeDetectorRef, Directive, inject, Input, OnInit } from '@angular/core'; import { UntypedFormControl, Validators } from '@angular/forms'; -import { _ } from '@ngx-translate/core'; -import { BehaviorSubject, combineLatest, debounceTime, distinctUntilChanged, Observable, Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; import { GlobalVote, IdentifiedVotingData, @@ -11,14 +9,16 @@ import { PollType, VoteValue, VotingData -} from 'src/app/domain/models/poll'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { PollControllerService } from 'src/app/site/pages/meetings/modules/poll/services/poll-controller.service'; -import { ViewOption, ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { CustomIcon } from 'src/app/ui/modules/custom-icon/definitions'; +} from '@app/domain/models/poll'; +import { BaseComponent } from '@app/site/base/base.component'; +import { PollControllerService } from '@app/site/pages/meetings/modules/poll/services/poll-controller.service'; +import { ViewOption, ViewPoll } from '@app/site/pages/meetings/pages/polls'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { CustomIcon } from '@app/ui/modules/custom-icon/definitions'; +import { _ } from '@ngx-translate/core'; +import { BehaviorSubject, combineLatest, debounceTime, distinctUntilChanged, Observable, Subscription } from 'rxjs'; import { MeetingSettingsService } from '../../../../services/meeting-settings.service'; import { VoteControllerService } from '../../services/vote-controller.service'; diff --git a/client/src/app/site/pages/meetings/modules/poll/components/chart/chart.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/chart/chart.component.ts index e45c196a57..2939a775d2 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/chart/chart.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/components/chart/chart.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { ChartjsComponent } from '@coreui/angular-chartjs'; import { ChartData as NgChartData, ChartOptions, ChartType } from 'chart.js'; @@ -24,6 +24,7 @@ type Label = SingleLineLabel | MultiLineLabel; selector: `os-chart`, templateUrl: `./chart.component.html`, styleUrls: [`./chart.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, imports: [ChartjsComponent] }) export class ChartComponent { diff --git a/client/src/app/site/pages/meetings/modules/poll/components/check-input/check-input.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/check-input/check-input.component.ts index 03e371d699..44d2132e96 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/check-input/check-input.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/components/check-input/check-input.component.ts @@ -1,12 +1,13 @@ -import { Component, forwardRef, Input, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, forwardRef, Input, OnInit } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR, UntypedFormBuilder, UntypedFormControl } from '@angular/forms'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; @Component({ selector: `os-check-input`, templateUrl: `./check-input.component.html`, styleUrls: [`./check-input.component.scss`], providers: [{ provide: NG_VALUE_ACCESSOR, multi: true, useExisting: forwardRef(() => CheckInputComponent) }], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CheckInputComponent extends BaseUiComponent implements OnInit, ControlValueAccessor { diff --git a/client/src/app/site/pages/meetings/modules/poll/components/entitled-users-table/entitled-users-table.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/entitled-users-table/entitled-users-table.component.ts index 04feaf2277..f1c3967e4b 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/entitled-users-table/entitled-users-table.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/components/entitled-users-table/entitled-users-table.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; import { map, Observable } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; import { ParticipantControllerService } from '../../../../pages/participants/services/common/participant-controller.service'; import { EntitledUsersTableEntry } from '../../definitions/entitled-users-table-entry'; diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-cannot-vote-message/poll-cannot-vote-message.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-cannot-vote-message/poll-cannot-vote-message.component.ts index 4a2b3a5e64..5f9e0324a7 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/poll-cannot-vote-message/poll-cannot-vote-message.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-cannot-vote-message/poll-cannot-vote-message.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from '@angular/core'; +import { OperatorService } from '@app/site/services/operator.service'; import { combineLatest, debounceTime, distinctUntilChanged } from 'rxjs'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { BaseMeetingComponent } from '../../../../base/base-meeting.component'; import { ViewPoll } from '../../../../pages/polls'; diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-filtered-votes-chart/poll-filtered-votes-chart.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-filtered-votes-chart/poll-filtered-votes-chart.component.ts index bbc7746642..9706f54bb6 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/poll-filtered-votes-chart/poll-filtered-votes-chart.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-filtered-votes-chart/poll-filtered-votes-chart.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnInit } from '@angular/core'; -import { PollPercentBase, VoteValue, VoteValueVerbose } from 'src/app/domain/models/poll'; -import { ThemeService } from 'src/app/site/services/theme.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; +import { PollPercentBase, VoteValue, VoteValueVerbose } from '@app/domain/models/poll'; +import { ThemeService } from '@app/site/services/theme.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { ViewPoll, ViewVote } from '../../../../pages/polls'; import { MeetingSettingsService } from '../../../../services/meeting-settings.service'; diff --git a/client/src/app/site/pages/meetings/modules/poll/components/poll-progress/poll-progress.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/poll-progress/poll-progress.component.ts index e6ad5451c3..14ad4f4a01 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/poll-progress/poll-progress.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/components/poll-progress/poll-progress.component.ts @@ -1,12 +1,12 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; +import { AutoupdateService } from '@app/site/services/autoupdate'; +import { ModelRequestBuilderService } from '@app/site/services/model-request-builder'; +import { OperatorService } from '@app/site/services/operator.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { map } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; -import { AutoupdateService } from 'src/app/site/services/autoupdate'; -import { ModelRequestBuilderService } from 'src/app/site/services/model-request-builder'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { getParticipantVoteInfoSubscriptionConfig } from '../../../../pages/participants/participants.subscription'; import { ActiveMeetingService } from '../../../../services/active-meeting.service'; diff --git a/client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.ts index 5a31facf53..80f4692665 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/components/single-option-chart-table/single-option-chart-table.component.ts @@ -1,6 +1,6 @@ -import { ChangeDetectorRef, Component, Input } from '@angular/core'; -import { PollData, PollMethod, PollTableData, VotingResult } from 'src/app/domain/models/poll'; -import { ThemeService } from 'src/app/site/services/theme.service'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from '@angular/core'; +import { PollData, PollMethod, PollTableData, VotingResult } from '@app/domain/models/poll'; +import { ThemeService } from '@app/site/services/theme.service'; import { PollService } from '../../services/poll.service'; import { ChartData } from '../chart/chart.component'; @@ -9,6 +9,7 @@ import { ChartData } from '../chart/chart.component'; selector: `os-single-option-chart-table`, templateUrl: `./single-option-chart-table.component.html`, styleUrls: [`./single-option-chart-table.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class SingleOptionChartTableComponent { diff --git a/client/src/app/site/pages/meetings/modules/poll/components/votes-table/votes-table.component.ts b/client/src/app/site/pages/meetings/modules/poll/components/votes-table/votes-table.component.ts index 1632ed806a..ded1ae6ed8 100644 --- a/client/src/app/site/pages/meetings/modules/poll/components/votes-table/votes-table.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/components/votes-table/votes-table.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; +import { PollContentObject } from '@app/domain/models/poll'; import { map, Observable } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { PollContentObject } from 'src/app/domain/models/poll'; import { BasePollDetailComponent, BaseVoteData } from '../../base/base-poll-detail.component'; import { PollService } from '../../services/poll.service'; diff --git a/client/src/app/site/pages/meetings/modules/poll/definitions/entitled-users-table-entry.ts b/client/src/app/site/pages/meetings/modules/poll/definitions/entitled-users-table-entry.ts index e40b09d33d..0a2a548283 100644 --- a/client/src/app/site/pages/meetings/modules/poll/definitions/entitled-users-table-entry.ts +++ b/client/src/app/site/pages/meetings/modules/poll/definitions/entitled-users-table-entry.ts @@ -1,6 +1,6 @@ -import { Identifiable } from 'src/app/domain/interfaces'; -import { EntitledUsersEntry } from 'src/app/domain/models/poll/poll-constants'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; +import { Identifiable } from '@app/domain/interfaces'; +import { EntitledUsersEntry } from '@app/domain/models/poll/poll-constants'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; export interface EntitledUsersTableEntry extends EntitledUsersEntry, Identifiable { user?: ViewUser; diff --git a/client/src/app/site/pages/meetings/modules/poll/definitions/poll-dialog-data.ts b/client/src/app/site/pages/meetings/modules/poll/definitions/poll-dialog-data.ts index d82d27c594..ba76089a6b 100644 --- a/client/src/app/site/pages/meetings/modules/poll/definitions/poll-dialog-data.ts +++ b/client/src/app/site/pages/meetings/modules/poll/definitions/poll-dialog-data.ts @@ -1,6 +1,6 @@ -import { Fqid } from 'src/app/domain/definitions/key-types'; -import { BaseModel } from 'src/app/domain/models/base/base-model'; -import { Poll } from 'src/app/domain/models/poll/poll'; +import { Fqid } from '@app/domain/definitions/key-types'; +import { BaseModel } from '@app/domain/models/base/base-model'; +import { Poll } from '@app/domain/models/poll/poll'; export interface PollDialogData { // Required diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.ts b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.ts index 50d335138f..deb6394cbb 100644 --- a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.ts +++ b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component.ts @@ -1,9 +1,10 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; @Component({ selector: `os-voting-privacy-warning-dialog`, templateUrl: `./voting-privacy-warning-dialog.component.html`, styleUrls: [`./voting-privacy-warning-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class VotingPrivacyWarningDialogComponent {} diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.ts b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.ts index 019a5dd8a1..038590869b 100644 --- a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { VotingPrivacyWarningDialogComponent } from '../components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component'; diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/voting-privacy-dialog.module.ts b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/voting-privacy-dialog.module.ts index d9fb48f7d6..bb59b31a9a 100644 --- a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/voting-privacy-dialog.module.ts +++ b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/voting-privacy-dialog.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatDialogModule } from '@angular/material/dialog'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { VotingPrivacyWarningDialogComponent } from './components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component'; diff --git a/client/src/app/site/pages/meetings/modules/poll/pipes/poll-key-verbose/poll-key-verbose.pipe.ts b/client/src/app/site/pages/meetings/modules/poll/pipes/poll-key-verbose/poll-key-verbose.pipe.ts index 7492e326ba..9e67866165 100644 --- a/client/src/app/site/pages/meetings/modules/poll/pipes/poll-key-verbose/poll-key-verbose.pipe.ts +++ b/client/src/app/site/pages/meetings/modules/poll/pipes/poll-key-verbose/poll-key-verbose.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { PollValues } from 'src/app/domain/models/poll'; +import { PollValues } from '@app/domain/models/poll'; /** * Pipe to transform a key from polls into a speaking word. diff --git a/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.spec.ts b/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.spec.ts index c0f17142f7..2f3ac6eaa9 100644 --- a/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.spec.ts +++ b/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.spec.ts @@ -1,5 +1,4 @@ import { TestBed } from '@angular/core/testing'; -import { Observable } from 'rxjs'; import { OptionData, PollClassType, @@ -9,7 +8,8 @@ import { PollState, PollTableData, PollType -} from 'src/app/domain/models/poll'; +} from '@app/domain/models/poll'; +import { Observable } from 'rxjs'; import { PollService } from '../../services/poll.service'; import { PollServiceMapperService } from '../../services/poll-service-mapper.service'; diff --git a/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.ts b/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.ts index b7003d1513..1aba7c24de 100644 --- a/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.ts +++ b/client/src/app/site/pages/meetings/modules/poll/pipes/poll-percent-base/poll-percent-base.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { OptionData, PollData } from 'src/app/domain/models/poll/generic-poll'; -import { PollTableData } from 'src/app/domain/models/poll/poll-constants'; +import { OptionData, PollData } from '@app/domain/models/poll/generic-poll'; +import { PollTableData } from '@app/domain/models/poll/poll-constants'; import { PollService } from '../../services/poll.service/poll.service'; import { PollServiceMapperService } from '../../services/poll-service-mapper.service/poll-service-mapper.service'; diff --git a/client/src/app/site/pages/meetings/modules/poll/poll.module.ts b/client/src/app/site/pages/meetings/modules/poll/poll.module.ts index 13048db5a2..4a9a944461 100644 --- a/client/src/app/site/pages/meetings/modules/poll/poll.module.ts +++ b/client/src/app/site/pages/meetings/modules/poll/poll.module.ts @@ -11,11 +11,11 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatRadioModule } from '@angular/material/radio'; import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { ListModule } from 'src/app/ui/modules/list'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { ListModule } from '@app/ui/modules/list'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; import { ChartComponent } from './components/chart/chart.component'; import { CheckInputComponent } from './components/check-input/check-input.component'; diff --git a/client/src/app/site/pages/meetings/modules/poll/services/entitled-user-filter.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/entitled-user-filter.service.ts index bddf1ac8f6..1547489f0f 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/entitled-user-filter.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/entitled-user-filter.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; +import { BaseFilterListService, OsFilter } from '@app/site/base/base-filter.service'; +import { ActiveFiltersService } from '@app/site/services/active-filters.service'; import { _ } from '@ngx-translate/core'; -import { BaseFilterListService, OsFilter } from 'src/app/site/base/base-filter.service'; -import { ActiveFiltersService } from 'src/app/site/services/active-filters.service'; @Injectable({ providedIn: 'root' diff --git a/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.ts index 9069725258..9d7727bfd5 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; +import { Fqid } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Poll } from '@app/domain/models/poll/poll'; +import { PollState } from '@app/domain/models/poll/poll-constants'; +import { PollRepositoryService } from '@app/gateways/repositories/polls/poll-repository.service'; +import { VoteRepositoryService } from '@app/gateways/repositories/polls/vote-repository.service'; +import { viewModelListEqual } from '@app/infrastructure/utils'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { distinctUntilChanged, map, Observable } from 'rxjs'; -import { Fqid } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Poll } from 'src/app/domain/models/poll/poll'; -import { PollState } from 'src/app/domain/models/poll/poll-constants'; -import { PollRepositoryService } from 'src/app/gateways/repositories/polls/poll-repository.service'; -import { VoteRepositoryService } from 'src/app/gateways/repositories/polls/vote-repository.service'; -import { viewModelListEqual } from 'src/app/infrastructure/utils'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { ViewPoll } from '../../../../pages/polls'; diff --git a/client/src/app/site/pages/meetings/modules/poll/services/poll-dialog.service/poll-dialog.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/poll-dialog.service/poll-dialog.service.ts index 09e7cccdf3..1f09d03315 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/poll-dialog.service/poll-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/poll-dialog.service/poll-dialog.service.ts @@ -1,8 +1,8 @@ import { ComponentType } from '@angular/cdk/portal'; import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; import { firstValueFrom } from 'rxjs'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; @Injectable({ providedIn: 'root' diff --git a/client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts index 474c1a6bd3..ab7cc67f84 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts @@ -1,7 +1,6 @@ import { inject, Injectable } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; -import { OptionData, PollData } from 'src/app/domain/models/poll/generic-poll'; -import { OptionDataKey } from 'src/app/domain/models/poll/generic-poll'; +import { OptionData, PollData } from '@app/domain/models/poll/generic-poll'; +import { OptionDataKey } from '@app/domain/models/poll/generic-poll'; import { ABSTAIN_KEY, CalculablePollKey, @@ -22,11 +21,12 @@ import { VOTE_UNDOCUMENTED, VotingResult, YES_KEY -} from 'src/app/domain/models/poll/poll-constants'; -import { compareNumber } from 'src/app/infrastructure/utils'; -import { ChartData, ChartDate } from 'src/app/site/pages/meetings/modules/poll/components/chart/chart.component'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; -import { ThemeService } from 'src/app/site/services/theme.service'; +} from '@app/domain/models/poll/poll-constants'; +import { compareNumber } from '@app/infrastructure/utils'; +import { ChartData, ChartDate } from '@app/site/pages/meetings/modules/poll/components/chart/chart.component'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { ThemeService } from '@app/site/services/theme.service'; +import { TranslateService } from '@ngx-translate/core'; import { isSortedList } from '../../../../pages/polls/view-models/sorted-list'; import { ActiveMeetingService } from '../../../../services/active-meeting.service'; diff --git a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.ts index 78cb14942c..ad8cc4161c 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Vote } from '@app/domain/models/poll/vote'; +import { VoteRepositoryService } from '@app/gateways/repositories/polls/vote-repository.service'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Vote } from 'src/app/domain/models/poll/vote'; -import { VoteRepositoryService } from 'src/app/gateways/repositories/polls/vote-repository.service'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { ViewPoll, ViewVote } from '../../../../pages/polls'; diff --git a/client/src/app/site/pages/meetings/modules/poll/services/votes-filter.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/votes-filter.service.ts index 34748810e5..45b21e8c5f 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/votes-filter.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/votes-filter.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { BaseFilterListService, OsFilter } from 'src/app/site/base/base-filter.service'; -import { ActiveFiltersService } from 'src/app/site/services/active-filters.service'; +import { BaseFilterListService, OsFilter } from '@app/site/base/base-filter.service'; +import { ActiveFiltersService } from '@app/site/services/active-filters.service'; import { GroupControllerService } from '../../../pages/participants'; import { StructureLevelControllerService } from '../../../pages/participants/pages/structure-levels/services/structure-level-controller.service'; diff --git a/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.ts index 14dec537b1..8cbca8e162 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; +import { PollState, PollType } from '@app/domain/models/poll/poll-constants'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OperatorService } from '@app/site/services/operator.service'; import { _ } from '@ngx-translate/core'; -import { PollState, PollType } from 'src/app/domain/models/poll/poll-constants'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { ActiveMeetingService } from '../../../../services/active-meeting.service'; import { MeetingSettingsService } from '../../../../services/meeting-settings.service'; diff --git a/client/src/app/site/pages/meetings/modules/projector/components/projector/projector.component.ts b/client/src/app/site/pages/meetings/modules/projector/components/projector/projector.component.ts index 06fc37ec29..f4839a15f1 100644 --- a/client/src/app/site/pages/meetings/modules/projector/components/projector/projector.component.ts +++ b/client/src/app/site/pages/meetings/modules/projector/components/projector/projector.component.ts @@ -1,14 +1,14 @@ -import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { UnsafeHtml } from '@app/domain/definitions/key-types'; +import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { AuthTokenService } from '@app/site/services/auth-token.service'; +import { ConnectionStatusService } from '@app/site/services/connection-status.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; +import { DirectivesModule } from '@app/ui/directives'; +import { PipesModule } from '@app/ui/pipes'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import { UnsafeHtml } from 'src/app/domain/definitions/key-types'; -import { ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { AuthTokenService } from 'src/app/site/services/auth-token.service'; -import { ConnectionStatusService } from 'src/app/site/services/connection-status.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { PipesModule } from 'src/app/ui/pipes'; import { Dimension } from '../../../../pages/projectors/definitions'; @@ -17,6 +17,7 @@ import { Dimension } from '../../../../pages/projectors/definitions'; imports: [DirectivesModule, PipesModule], selector: `os-projector`, templateUrl: `./projector.component.html`, + changeDetection: ChangeDetectionStrategy.Eager, styleUrls: [`./projector.component.scss`] }) export class ProjectorComponent extends BaseUiComponent implements OnInit, OnDestroy { diff --git a/client/src/app/site/pages/meetings/modules/projector/modules/countdown-time/countdown-time.component.ts b/client/src/app/site/pages/meetings/modules/projector/modules/countdown-time/countdown-time.component.ts index 73860021f0..cf48270ba7 100644 --- a/client/src/app/site/pages/meetings/modules/projector/modules/countdown-time/countdown-time.component.ts +++ b/client/src/app/site/pages/meetings/modules/projector/modules/countdown-time/countdown-time.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy } from '@angular/core'; -import { ServerTimeService } from 'src/app/gateways/server-time.service'; +import { ServerTimeService } from '@app/gateways/server-time.service'; export interface CountdownData { running: boolean; diff --git a/client/src/app/site/pages/meetings/modules/projector/projector.module.ts b/client/src/app/site/pages/meetings/modules/projector/projector.module.ts index 371ac0d73e..b8ce2eeec0 100644 --- a/client/src/app/site/pages/meetings/modules/projector/projector.module.ts +++ b/client/src/app/site/pages/meetings/modules/projector/projector.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; import { TopicPollServiceModule } from '../../pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-service.module'; import { AssignmentPollServiceModule } from '../../pages/assignments/modules/assignment-poll/services/assignment-poll-service.module'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/agenda-routing.module.ts b/client/src/app/site/pages/meetings/pages/agenda/agenda-routing.module.ts index 5d7c80f4f7..684ed87365 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/agenda-routing.module.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/agenda-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Permission } from 'src/app/domain/definitions/permission'; +import { Permission } from '@app/domain/definitions/permission'; import { PermissionGuard } from '../../../../guards/permission.guard'; import { AgendaMainComponent } from './components/agenda-main/agenda-main.component'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/agenda.config.ts b/client/src/app/site/pages/meetings/pages/agenda/agenda.config.ts index 12cd48778b..3816d1ceaa 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/agenda.config.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/agenda.config.ts @@ -1,17 +1,17 @@ -import { Permission } from 'src/app/domain/definitions/permission'; -import { AgendaItem } from 'src/app/domain/models/agenda/agenda-item'; -import { ListOfSpeakers } from 'src/app/domain/models/list-of-speakers/list-of-speakers'; -import { PointOfOrderCategory } from 'src/app/domain/models/point-of-order-category/point-of-order-category'; -import { Speaker } from 'src/app/domain/models/speakers/speaker'; -import { StructureLevelListOfSpeakers } from 'src/app/domain/models/structure-levels/structure-level-list-of-speakers'; -import { Topic } from 'src/app/domain/models/topics/topic'; -import { AgendaItemRepositoryService } from 'src/app/gateways/repositories/agenda'; -import { ListOfSpeakersRepositoryService } from 'src/app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service'; -import { PointOfOrderCategoryRepositoryService } from 'src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service'; -import { SpeakerRepositoryService } from 'src/app/gateways/repositories/speakers/speaker-repository.service'; -import { StructureLevelListOfSpeakersRepositoryService } from 'src/app/gateways/repositories/structure-level-list-of-speakers'; -import { TopicRepositoryService } from 'src/app/gateways/repositories/topics/topic-repository.service'; -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; +import { Permission } from '@app/domain/definitions/permission'; +import { AgendaItem } from '@app/domain/models/agenda/agenda-item'; +import { ListOfSpeakers } from '@app/domain/models/list-of-speakers/list-of-speakers'; +import { PointOfOrderCategory } from '@app/domain/models/point-of-order-category/point-of-order-category'; +import { Speaker } from '@app/domain/models/speakers/speaker'; +import { StructureLevelListOfSpeakers } from '@app/domain/models/structure-levels/structure-level-list-of-speakers'; +import { Topic } from '@app/domain/models/topics/topic'; +import { AgendaItemRepositoryService } from '@app/gateways/repositories/agenda'; +import { ListOfSpeakersRepositoryService } from '@app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service'; +import { PointOfOrderCategoryRepositoryService } from '@app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service'; +import { SpeakerRepositoryService } from '@app/gateways/repositories/speakers/speaker-repository.service'; +import { StructureLevelListOfSpeakersRepositoryService } from '@app/gateways/repositories/structure-level-list-of-speakers'; +import { TopicRepositoryService } from '@app/gateways/repositories/topics/topic-repository.service'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; import { ViewStructureLevelListOfSpeakers } from '../participants/pages/structure-levels/view-models'; import { ViewListOfSpeakers, ViewSpeaker, ViewTopic } from './modules'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts b/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts index f9b4cced30..7b84f96e03 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/agenda.subscription.ts @@ -1,9 +1,9 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { FULL_FIELDSET, MEETING_ROUTING_FIELDS } from 'src/app/domain/fieldsets/misc'; -import { MeetingUserFieldsets, UserFieldsets } from 'src/app/domain/fieldsets/user'; -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { FollowList } from 'src/app/site/services/model-request-builder'; +import { Id } from '@app/domain/definitions/key-types'; +import { FULL_FIELDSET, MEETING_ROUTING_FIELDS } from '@app/domain/fieldsets/misc'; +import { MeetingUserFieldsets, UserFieldsets } from '@app/domain/fieldsets/user'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { FollowList } from '@app/site/services/model-request-builder'; import { pollModelRequest } from '../polls/polls.subscription'; import { ViewListOfSpeakers, ViewTopic } from './modules'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/components/agenda-forward-dialog/components/agenda-forward-dialog/agenda-forward-dialog.component.ts b/client/src/app/site/pages/meetings/pages/agenda/components/agenda-forward-dialog/components/agenda-forward-dialog/agenda-forward-dialog.component.ts index 70ca523f46..163541f2a5 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/components/agenda-forward-dialog/components/agenda-forward-dialog/agenda-forward-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/components/agenda-forward-dialog/components/agenda-forward-dialog/agenda-forward-dialog.component.ts @@ -1,18 +1,18 @@ import { CommonModule } from '@angular/common'; -import { Component, Inject, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatCheckboxChange, MatCheckboxModule } from '@angular/material/checkbox'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { MatRadioModule } from '@angular/material/radio'; import { MatTableModule } from '@angular/material/table'; +import { Id, Ids } from '@app/domain/definitions/key-types'; +import { SpeechState } from '@app/domain/models/speakers/speech-state'; +import { GetForwardingMeetingsPresenter, GetForwardingMeetingsPresenterMeeting } from '@app/gateways/presenter'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { MeetingTimeComponent } from '@app/ui/modules/meeting-time/meeting-time.component'; import { TranslatePipe } from '@ngx-translate/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Id, Ids } from 'src/app/domain/definitions/key-types'; -import { SpeechState } from 'src/app/domain/models/speakers/speech-state'; -import { GetForwardingMeetingsPresenter, GetForwardingMeetingsPresenterMeeting } from 'src/app/gateways/presenter'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { MeetingTimeComponent } from 'src/app/ui/modules/meeting-time/meeting-time.component'; import { ViewAgendaItem } from '../../../../view-models'; @@ -27,6 +27,7 @@ export interface AgendaForwardDialogReturnData { selector: 'os-agenda-forward-dialog', templateUrl: './agenda-forward-dialog.component.html', styleUrl: './agenda-forward-dialog.component.scss', + changeDetection: ChangeDetectionStrategy.Eager, imports: [ CommonModule, MatCheckboxModule, diff --git a/client/src/app/site/pages/meetings/pages/agenda/components/agenda-forward-dialog/services/agenda-forward-dialog.service.ts b/client/src/app/site/pages/meetings/pages/agenda/components/agenda-forward-dialog/services/agenda-forward-dialog.service.ts index d92fd0c370..9afa31729e 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/components/agenda-forward-dialog/services/agenda-forward-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/components/agenda-forward-dialog/services/agenda-forward-dialog.service.ts @@ -1,21 +1,21 @@ import { Injectable, OnDestroy } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Ids } from '@app/domain/definitions/key-types'; +import { Selectable } from '@app/domain/interfaces'; +import { Meeting } from '@app/domain/models/meetings/meeting'; +import { Topic } from '@app/domain/models/topics/topic'; +import { GetForwardingMeetingsPresenter } from '@app/gateways/presenter'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { ViewCommittee } from '@app/site/pages/organization/pages/committees'; +import { AutoupdateService } from '@app/site/services/autoupdate'; +import { ModelRequestBuilderService } from '@app/site/services/model-request-builder'; +import { OperatorService } from '@app/site/services/operator.service'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { TranslateService } from '@ngx-translate/core'; import { endOfDay, fromUnixTime } from 'date-fns'; import { BehaviorSubject, firstValueFrom, Observable, Subscription } from 'rxjs'; -import { Ids } from 'src/app/domain/definitions/key-types'; -import { Selectable } from 'src/app/domain/interfaces'; -import { Meeting } from 'src/app/domain/models/meetings/meeting'; -import { Topic } from 'src/app/domain/models/topics/topic'; -import { GetForwardingMeetingsPresenter } from 'src/app/gateways/presenter'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { ViewCommittee } from 'src/app/site/pages/organization/pages/committees'; -import { AutoupdateService } from 'src/app/site/services/autoupdate'; -import { ModelRequestBuilderService } from 'src/app/site/services/model-request-builder'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; import { AgendaItemControllerService } from '../../../services'; import { ViewAgendaItem } from '../../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/components/agenda-main/agenda-main.component.ts b/client/src/app/site/pages/meetings/pages/agenda/components/agenda-main/agenda-main.component.ts index 8e7d061bf9..19be1c55e1 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/components/agenda-main/agenda-main.component.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/components/agenda-main/agenda-main.component.ts @@ -1,7 +1,7 @@ -import { Component } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfig } from 'src/app/domain/interfaces/subscription-config'; -import { BaseMeetingModelRequestHandler } from 'src/app/site/pages/meetings/base/base-meeting-model-request-handler.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfig } from '@app/domain/interfaces/subscription-config'; +import { BaseMeetingModelRequestHandler } from '@app/site/pages/meetings/base/base-meeting-model-request-handler.component'; import { getAgendaListSubscriptionConfig } from '../../agenda.subscription'; @@ -9,6 +9,7 @@ import { getAgendaListSubscriptionConfig } from '../../agenda.subscription'; selector: `os-agenda-main`, templateUrl: `./agenda-main.component.html`, styleUrls: [`./agenda-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AgendaMainComponent extends BaseMeetingModelRequestHandler { diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/components/list-of-speakers-main/list-of-speakers-main.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/components/list-of-speakers-main/list-of-speakers-main.component.ts index dfb540ec0f..875d8d9729 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/components/list-of-speakers-main/list-of-speakers-main.component.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/components/list-of-speakers-main/list-of-speakers-main.component.ts @@ -1,8 +1,8 @@ -import { Component } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { ListOfSpeakers } from 'src/app/domain/models/list-of-speakers/list-of-speakers'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; -import { SequentialNumberMappingService } from 'src/app/site/pages/meetings/services/sequential-number-mapping.service'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { ListOfSpeakers } from '@app/domain/models/list-of-speakers/list-of-speakers'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; +import { SequentialNumberMappingService } from '@app/site/pages/meetings/services/sequential-number-mapping.service'; import { getListOfSpeakersDetailSubscriptionConfig } from '../../../../agenda.subscription'; @@ -10,6 +10,7 @@ import { getListOfSpeakersDetailSubscriptionConfig } from '../../../../agenda.su selector: `os-list-of-speakers-main`, templateUrl: `./list-of-speakers-main.component.html`, styleUrls: [`./list-of-speakers-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ListOfSpeakersMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/components/list-of-speakers/list-of-speakers.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/components/list-of-speakers/list-of-speakers.component.ts index 0d253a9997..13fe5891d4 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/components/list-of-speakers/list-of-speakers.component.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/components/list-of-speakers/list-of-speakers.component.ts @@ -1,15 +1,15 @@ -import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { collectionFromFqid } from '@app/infrastructure/utils/transform-functions'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ListOfSpeakersContentComponent } from '@app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component'; +import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; +import { ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models/projection-build-descriptor'; +import { CollectionMapperService } from '@app/site/services/collection-mapper.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { collectionFromFqid } from 'src/app/infrastructure/utils/transform-functions'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ListOfSpeakersContentComponent } from 'src/app/site/pages/meetings/modules/list-of-speakers-content/components/list-of-speakers-content/list-of-speakers-content.component'; -import { ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; -import { ProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models/projection-build-descriptor'; -import { CollectionMapperService } from 'src/app/site/services/collection-mapper.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { CurrentListOfSpeakersSlideService } from '../../services/current-list-of-speakers-slide.service'; import { ListOfSpeakersControllerService } from '../../services/list-of-speakers-controller.service'; @@ -19,6 +19,7 @@ import { ViewListOfSpeakers } from '../../view-models'; selector: `os-list-of-speakers`, templateUrl: `./list-of-speakers.component.html`, styleUrls: [`./list-of-speakers.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ListOfSpeakersComponent extends BaseMeetingComponent implements OnInit, OnDestroy { diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/list-of-speakers.module.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/list-of-speakers.module.ts index bb9aba47fc..81c6a15101 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/list-of-speakers.module.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/list-of-speakers.module.ts @@ -6,11 +6,11 @@ import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { ListOfSpeakersContentModule } from 'src/app/site/pages/meetings/modules/list-of-speakers-content'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { ListOfSpeakersContentModule } from '@app/site/pages/meetings/modules/list-of-speakers-content'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { DirectivesModule } from '@app/ui/directives'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; import { ListOfSpeakersComponent } from './components/list-of-speakers/list-of-speakers.component'; import { ListOfSpeakersMainComponent } from './components/list-of-speakers-main/list-of-speakers-main.component'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service.ts index 7638f83d0e..6bd4597531 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { PROJECTIONDEFAULT } from 'src/app/domain/models/projector/projection-default'; -import { MeetingProjectionType } from 'src/app/gateways/repositories/meeting-repository.service'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { ProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models'; +import { PROJECTIONDEFAULT } from '@app/domain/models/projector/projection-default'; +import { MeetingProjectionType } from '@app/gateways/repositories/meeting-repository.service'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models'; import { ViewProjector } from '../../../../projectors'; import { ProjectorControllerService } from '../../../../projectors/services/projector-controller.service'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-speaking-structure-level-slide.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-speaking-structure-level-slide.service.ts index 6332cb0ff1..5770c99a5f 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-speaking-structure-level-slide.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-speaking-structure-level-slide.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { PROJECTIONDEFAULT } from 'src/app/domain/models/projector/projection-default'; -import { MeetingProjectionType } from 'src/app/gateways/repositories/meeting-repository.service'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { ProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models'; +import { PROJECTIONDEFAULT } from '@app/domain/models/projector/projection-default'; +import { MeetingProjectionType } from '@app/gateways/repositories/meeting-repository.service'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models'; import { ViewProjector } from '../../../../projectors'; import { ProjectorControllerService } from '../../../../projectors/services/projector-controller.service'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-structure-level-list-slide.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-structure-level-list-slide.service.ts index 0750db9db3..690e7cc2b4 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-structure-level-list-slide.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-structure-level-list-slide.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { PROJECTIONDEFAULT } from 'src/app/domain/models/projector/projection-default'; -import { MeetingProjectionType } from 'src/app/gateways/repositories/meeting-repository.service'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { ProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models'; +import { PROJECTIONDEFAULT } from '@app/domain/models/projector/projection-default'; +import { MeetingProjectionType } from '@app/gateways/repositories/meeting-repository.service'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models'; import { ViewProjector } from '../../../../projectors'; import { ProjectorControllerService } from '../../../../projectors/services/projector-controller.service'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service.ts index a6154b9089..e8bd236063 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { ListOfSpeakers } from 'src/app/domain/models/list-of-speakers/list-of-speakers'; -import { ListOfSpeakersRepositoryService } from 'src/app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service'; -import { BaseController } from 'src/app/site/base/base-controller'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ControllerServiceCollectorService } from 'src/app/site/services/controller-service-collector.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { ListOfSpeakers } from '@app/domain/models/list-of-speakers/list-of-speakers'; +import { ListOfSpeakersRepositoryService } from '@app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service'; +import { BaseController } from '@app/site/base/base-controller'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ControllerServiceCollectorService } from '@app/site/services/controller-service-collector.service'; import { ViewStructureLevel } from '../../../../participants/pages/structure-levels/view-models'; import { ViewListOfSpeakers, ViewSpeaker } from '../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/point-of-order-category-controller.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/point-of-order-category-controller.service.ts index b8a8cfeb3f..f4fa7c4c70 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/point-of-order-category-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/point-of-order-category-controller.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { PointOfOrderCategory } from 'src/app/domain/models/point-of-order-category/point-of-order-category'; -import { PointOfOrderCategoryRepositoryService } from 'src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { PointOfOrderCategory } from '@app/domain/models/point-of-order-category/point-of-order-category'; +import { PointOfOrderCategoryRepositoryService } from '@app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { ViewPointOfOrderCategory } from '../view-models/view-point-of-order-category'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service.ts index 43723be50d..959cbe441f 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service.ts @@ -1,15 +1,15 @@ import { Injectable } from '@angular/core'; -import { map, Observable } from 'rxjs'; -import { Id, UnsafeHtml } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Speaker } from 'src/app/domain/models/speakers/speaker'; -import { SPECIAL_SPEECH_STATES, SpeechState } from 'src/app/domain/models/speakers/speech-state'; +import { Id, UnsafeHtml } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Speaker } from '@app/domain/models/speakers/speaker'; +import { SPECIAL_SPEECH_STATES, SpeechState } from '@app/domain/models/speakers/speech-state'; import { PointOfOrderInformation, SpeakerRepositoryService -} from 'src/app/gateways/repositories/speakers/speaker-repository.service'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; +} from '@app/gateways/repositories/speakers/speaker-repository.service'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; +import { map, Observable } from 'rxjs'; import { MeetingControllerServiceCollectorService } from '../../../../../services/meeting-controller-service-collector.service'; import { ViewListOfSpeakers, ViewSpeaker } from '../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/has-list-of-speakers.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/has-list-of-speakers.ts index ec8b06dfbd..ad1b830aca 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/has-list-of-speakers.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/has-list-of-speakers.ts @@ -1,5 +1,5 @@ -import { DetailNavigable, HasListOfSpeakersId } from 'src/app/domain/interfaces'; -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { DetailNavigable, HasListOfSpeakersId } from '@app/domain/interfaces'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; import { ViewListOfSpeakers } from './view-list-of-speakers'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-list-of-speakers.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-list-of-speakers.ts index ebc166ecc0..477d977b55 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-list-of-speakers.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-list-of-speakers.ts @@ -1,12 +1,12 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { ListOfSpeakers } from 'src/app/domain/models/list-of-speakers/list-of-speakers'; -import { PROJECTIONDEFAULT, ProjectiondefaultValue } from 'src/app/domain/models/projector/projection-default'; -import { SpeakerState } from 'src/app/domain/models/speakers/speaker-state'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { ViewStructureLevelListOfSpeakers } from 'src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; -import { Projectable } from 'src/app/site/pages/meetings/view-models'; -import { BaseProjectableViewModel } from 'src/app/site/pages/meetings/view-models/base-projectable-model'; -import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting'; +import { Id } from '@app/domain/definitions/key-types'; +import { ListOfSpeakers } from '@app/domain/models/list-of-speakers/list-of-speakers'; +import { PROJECTIONDEFAULT, ProjectiondefaultValue } from '@app/domain/models/projector/projection-default'; +import { SpeakerState } from '@app/domain/models/speakers/speaker-state'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; +import { ViewStructureLevelListOfSpeakers } from '@app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; +import { Projectable } from '@app/site/pages/meetings/view-models'; +import { BaseProjectableViewModel } from '@app/site/pages/meetings/view-models/base-projectable-model'; +import { HasMeeting } from '@app/site/pages/meetings/view-models/has-meeting'; import { SpeakerStateOnList } from '../../../definitions/index'; import { HasAgendaItem } from '../../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-point-of-order-category.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-point-of-order-category.ts index 444f17b93e..346cb0c77e 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-point-of-order-category.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-point-of-order-category.ts @@ -1,6 +1,6 @@ -import { PointOfOrderCategory } from 'src/app/domain/models/point-of-order-category/point-of-order-category'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting'; +import { PointOfOrderCategory } from '@app/domain/models/point-of-order-category/point-of-order-category'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; +import { HasMeeting } from '@app/site/pages/meetings/view-models/has-meeting'; import { ViewSpeaker } from './view-speaker'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-speaker.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-speaker.ts index 2defd54ada..adb652eb8d 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-speaker.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/view-models/view-speaker.ts @@ -1,10 +1,10 @@ +import { SpeechState } from '@app/domain/models/speakers/speech-state'; +import { collectionFromFqid } from '@app/infrastructure/utils/transform-functions'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; +import { BaseHasMeetingUserViewModel } from '@app/site/pages/meetings/base/base-has-meeting-user-view-model'; +import { CountdownData } from '@app/site/pages/meetings/modules/projector/modules/countdown-time/countdown-time.component'; +import { ViewStructureLevelListOfSpeakers } from '@app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; import { _ } from '@ngx-translate/core'; -import { SpeechState } from 'src/app/domain/models/speakers/speech-state'; -import { collectionFromFqid } from 'src/app/infrastructure/utils/transform-functions'; -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { BaseHasMeetingUserViewModel } from 'src/app/site/pages/meetings/base/base-has-meeting-user-view-model'; -import { CountdownData } from 'src/app/site/pages/meetings/modules/projector/modules/countdown-time/countdown-time.component'; -import { ViewStructureLevelListOfSpeakers } from 'src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; import { Id } from '../../../../../../../../domain/definitions/key-types'; import { Speaker } from '../../../../../../../../domain/models/speakers/speaker'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-detail-content/topic-poll-detail-content.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-detail-content/topic-poll-detail-content.component.ts index f000353faa..70a7974339 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-detail-content/topic-poll-detail-content.component.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-detail-content/topic-poll-detail-content.component.ts @@ -1,9 +1,9 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from '@angular/core'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { pollChartColors, PollData, PollState, PollTableData } from 'src/app/domain/models/poll'; -import { ChartData } from 'src/app/site/pages/meetings/modules/poll/components/chart/chart.component'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; +import { Permission } from '@app/domain/definitions/permission'; +import { pollChartColors, PollData, PollState, PollTableData } from '@app/domain/models/poll'; +import { ChartData } from '@app/site/pages/meetings/modules/poll/components/chart/chart.component'; +import { OperatorService } from '@app/site/services/operator.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { TopicPollService } from '../../services/topic-poll.service'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.ts index 2a55e984c7..f00108febd 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-dialog/topic-poll-dialog.component.ts @@ -1,10 +1,16 @@ -import { AfterViewInit, Component, ElementRef, Inject, QueryList, ViewChild, ViewChildren } from '@angular/core'; +import { + AfterViewInit, + ChangeDetectionStrategy, + Component, + ElementRef, + Inject, + QueryList, + ViewChild, + ViewChildren +} from '@angular/core'; import { Validators } from '@angular/forms'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { _ } from '@ngx-translate/core'; -import { BehaviorSubject } from 'rxjs'; -import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; -import { Selectable } from 'src/app/domain/interfaces'; +import { Selectable } from '@app/domain/interfaces'; import { GeneralValueVerbose, LOWEST_VOTE_VALUE, @@ -13,9 +19,12 @@ import { PollPropertyVerbose, PollTypeVerbose, VoteValue -} from 'src/app/domain/models/poll'; -import { BasePollDialogComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; +} from '@app/domain/models/poll'; +import { BasePollDialogComponent } from '@app/site/pages/meetings/modules/poll/base/base-poll-dialog.component'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; +import { _ } from '@ngx-translate/core'; +import { BehaviorSubject } from 'rxjs'; +import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; import { ViewTopic } from '../../../../view-models'; import { TopicPollMethodVerbose } from '../../definitions'; @@ -40,6 +49,7 @@ export class TextOptionSelectable implements Selectable { selector: `os-topic-poll-dialog`, templateUrl: `./topic-poll-dialog.component.html`, styleUrls: [`./topic-poll-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class TopicPollDialogComponent extends BasePollDialogComponent implements AfterViewInit { diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-form/topic-poll-form.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-form/topic-poll-form.component.ts index b37849b2a7..7f475f4daa 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-form/topic-poll-form.component.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-form/topic-poll-form.component.ts @@ -1,8 +1,8 @@ -import { Component, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ViewEncapsulation } from '@angular/core'; import { BasePollFormComponent, PollFormHideSelectsData -} from 'src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component'; +} from '@app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component'; @Component({ selector: `os-topic-poll-form`, @@ -10,6 +10,7 @@ import { styleUrls: [`../../../../../../../../modules/poll/components/base-poll-form/base-poll-form.component.scss`], providers: [{ provide: BasePollFormComponent, useExisting: TopicPollFormComponent }], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class TopicPollFormComponent extends BasePollFormComponent { diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.ts index 5c61276ccb..4fea9aacdb 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-meta-info/topic-poll-meta-info.component.ts @@ -1,7 +1,7 @@ -import { Component, Input } from '@angular/core'; -import { PollPropertyVerbose } from 'src/app/domain/models/poll'; -import { BasePollMetaInformationComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component'; -import { ViewOption } from 'src/app/site/pages/meetings/pages/polls'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { PollPropertyVerbose } from '@app/domain/models/poll'; +import { BasePollMetaInformationComponent } from '@app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component'; +import { ViewOption } from '@app/site/pages/meetings/pages/polls'; import { TopicPollMethodVerbose } from '../../definitions'; @@ -9,6 +9,7 @@ import { TopicPollMethodVerbose } from '../../definitions'; selector: `os-topic-poll-meta-info`, templateUrl: `./topic-poll-meta-info.component.html`, styleUrls: [`./topic-poll-meta-info.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class TopicPollMetaInfoComponent extends BasePollMetaInformationComponent { diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-vote/topic-poll-vote.component.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-vote/topic-poll-vote.component.ts index 43154ee0d7..ff876c8f0a 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-vote/topic-poll-vote.component.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll-vote/topic-poll-vote.component.ts @@ -1,15 +1,15 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { _ } from '@ngx-translate/core'; -import { VoteValue } from 'src/app/domain/models/poll'; +import { VoteValue } from '@app/domain/models/poll'; import { BasePollVoteComponent, PollVoteViewSettings, VoteOption -} from 'src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component'; -import { ViewOption } from 'src/app/site/pages/meetings/pages/polls'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; +} from '@app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component'; +import { ViewOption } from '@app/site/pages/meetings/pages/polls'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; +import { _ } from '@ngx-translate/core'; import { ViewTopic } from '../../../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll/topic-poll.component.html b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll/topic-poll.component.html index 13d754dcce..f922f67012 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll/topic-poll.component.html +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/components/topic-poll/topic-poll.component.html @@ -47,7 +47,7 @@ diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/components/mediafile-list/mediafile-list.component.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/components/mediafile-list/mediafile-list.component.ts index 86e90b1c47..dea64bb027 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/components/mediafile-list/mediafile-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/components/mediafile-list/mediafile-list.component.ts @@ -1,24 +1,32 @@ -import { ChangeDetectorRef, Component, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + OnDestroy, + OnInit, + TemplateRef, + ViewChild +} from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; -import { TranslateService } from '@ngx-translate/core'; -import { BehaviorSubject, map, Observable, Subscription } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { Mediafile } from 'src/app/domain/models/mediafiles/mediafile'; +import { Permission } from '@app/domain/definitions/permission'; +import { Mediafile } from '@app/domain/models/mediafiles/mediafile'; import { FontDisplayNames, FontPlace, LogoDisplayNames, LogoPlace -} from 'src/app/domain/models/mediafiles/mediafile.constants'; -import { collectionFromFqid } from 'src/app/infrastructure/utils/transform-functions'; -import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; -import { ViewMediafile } from 'src/app/site/pages/meetings/pages/mediafiles'; -import { MediafileControllerService } from 'src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service'; -import { MediaManageService } from 'src/app/site/pages/meetings/services/media-manage.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { FileListComponent } from 'src/app/ui/modules/file-list/file-list.component'; +} from '@app/domain/models/mediafiles/mediafile.constants'; +import { collectionFromFqid } from '@app/infrastructure/utils/transform-functions'; +import { BaseMeetingListViewComponent } from '@app/site/pages/meetings/base/base-meeting-list-view.component'; +import { ViewMediafile } from '@app/site/pages/meetings/pages/mediafiles'; +import { MediafileControllerService } from '@app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service'; +import { MediaManageService } from '@app/site/pages/meetings/services/media-manage.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { FileListComponent } from '@app/ui/modules/file-list/file-list.component'; +import { TranslateService } from '@ngx-translate/core'; +import { BehaviorSubject, map, Observable, Subscription } from 'rxjs'; import { InteractionService } from '../../../../../interaction/services/interaction.service'; import { ViewGroup } from '../../../../../participants/modules/groups/view-models/view-group'; @@ -31,6 +39,7 @@ import { MediafileListGroupService } from '../../services/mediafile-list-group.s selector: `os-mediafile-list`, templateUrl: `./mediafile-list.component.html`, styleUrls: [`./mediafile-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MediafileListComponent extends BaseMeetingListViewComponent implements OnInit, OnDestroy { diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/mediafile-list.module.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/mediafile-list.module.ts index 941165a3db..8e3c6affa3 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/mediafile-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/mediafile-list.module.ts @@ -9,15 +9,15 @@ import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { FileListComponent } from 'src/app/ui/modules/file-list/file-list.component'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; -import { PipesModule } from 'src/app/ui/pipes/pipes.module'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { DirectivesModule } from '@app/ui/directives'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { FileListComponent } from '@app/ui/modules/file-list/file-list.component'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; +import { PipesModule } from '@app/ui/pipes/pipes.module'; import { MediafileCommonServiceModule } from '../../services/mediafile-common-service.module'; import { MediafileListComponent } from './components/mediafile-list/mediafile-list.component'; diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service.ts index 813ae67451..4757ec2a91 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; +import { FileExportService } from '@app/gateways/export/file-export.service/file-export.service'; +import { HttpService } from '@app/gateways/http.service'; +import { ViewMediafile } from '@app/site/pages/meetings/pages/mediafiles'; import JSZip from 'jszip'; -import { FileExportService } from 'src/app/gateways/export/file-export.service/file-export.service'; -import { HttpService } from 'src/app/gateways/http.service'; -import { ViewMediafile } from 'src/app/site/pages/meetings/pages/mediafiles'; @Injectable({ providedIn: 'root' diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-group.service/mediafile-list-group.service.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-group.service/mediafile-list-group.service.ts index 7a424371a2..956b1925a8 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-group.service/mediafile-list-group.service.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-group.service/mediafile-list-group.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; +import { GroupRepositoryService } from '@app/gateways/repositories/groups'; import { Observable } from 'rxjs'; -import { GroupRepositoryService } from 'src/app/gateways/repositories/groups'; import { ViewGroup } from '../../../../../participants'; diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-service.module.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-service.module.ts index c10bedaa34..3745733941 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-service.module.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-service.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { ExportServiceModule } from 'src/app/gateways/export'; +import { ExportServiceModule } from '@app/gateways/export'; @NgModule({ imports: [ExportServiceModule] }) export class MediafileListServiceModule {} diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-upload/components/mediafile-upload/mediafile-upload.component.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-upload/components/mediafile-upload/mediafile-upload.component.ts index 5bcff2d500..ccfeec6b25 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-upload/components/mediafile-upload/mediafile-upload.component.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-upload/components/mediafile-upload/mediafile-upload.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { MediafileControllerService } from '@app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { GroupControllerService } from '@app/site/pages/meetings/pages/participants/modules'; +import { OrganizationMediafileUploadComponent } from '@app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-upload/components/organization-mediafile-upload/organization-mediafile-upload.component'; import { map, Observable } from 'rxjs'; -import { MediafileControllerService } from 'src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { GroupControllerService } from 'src/app/site/pages/meetings/pages/participants/modules'; -import { OrganizationMediafileUploadComponent } from 'src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-upload/components/organization-mediafile-upload/organization-mediafile-upload.component'; import { MediafileCommonService } from '../../../../services/mediafile-common.service'; @@ -12,6 +12,7 @@ import { MediafileCommonService } from '../../../../services/mediafile-common.se selector: `os-mediafile-upload`, templateUrl: `./mediafile-upload.component.html`, styleUrls: [`./mediafile-upload.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MediafileUploadComponent extends OrganizationMediafileUploadComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-upload/mediafile-upload.module.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-upload/mediafile-upload.module.ts index 6616f63581..e7107aecea 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-upload/mediafile-upload.module.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-upload/mediafile-upload.module.ts @@ -5,11 +5,11 @@ import { MatCardModule } from '@angular/material/card'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { MediaUploadContentComponent } from 'src/app/ui/modules/media-upload-content/media-upload-content.component'; -import { ScrollingTableModule } from 'src/app/ui/modules/scrolling-table'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { MediaUploadContentComponent } from '@app/ui/modules/media-upload-content/media-upload-content.component'; +import { ScrollingTableModule } from '@app/ui/modules/scrolling-table'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; import { MediafileUploadComponent } from './components/mediafile-upload/mediafile-upload.component'; import { MediafileUploadRoutingModule } from './mediafile-upload-routing.module'; diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service.ts b/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service.ts index a765cba1c2..d715cd1abd 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service.ts @@ -2,10 +2,10 @@ import { Injectable, TemplateRef } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom } from 'rxjs'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { ActiveMeetingIdService } from '../../../services/active-meeting-id.service'; import { MediafileDeleteDialogComponent } from '../components/mediafile-delete-dialog/mediafile-delete-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service.ts b/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service.ts index 525c52f171..25f7d84d61 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Mediafile } from '@app/domain/models/mediafiles/mediafile'; +import { MediafileRepositoryService } from '@app/gateways/repositories/mediafiles/mediafile-repository.service'; +import { BaseController } from '@app/site/base/base-controller'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Mediafile } from 'src/app/domain/models/mediafiles/mediafile'; -import { MediafileRepositoryService } from 'src/app/gateways/repositories/mediafiles/mediafile-repository.service'; -import { BaseController } from 'src/app/site/base/base-controller'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { ActiveMeetingService } from '../../../services/active-meeting.service'; import { ViewMediafile } from '../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/view-models/has-attachment.ts b/client/src/app/site/pages/meetings/pages/mediafiles/view-models/has-attachment.ts index 7576cd305c..a5d83bd2e5 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/view-models/has-attachment.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/view-models/has-attachment.ts @@ -1,4 +1,4 @@ -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; import { HasAttachmentMeetingMediafileIds } from '../../../../../../domain/interfaces/has-attachment-ids'; import { ViewMeetingMediafile } from './view-meeting-mediafile'; diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/view-models/view-mediafile.ts b/client/src/app/site/pages/meetings/pages/mediafiles/view-models/view-mediafile.ts index a93c9118b6..604f757c36 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/view-models/view-mediafile.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/view-models/view-mediafile.ts @@ -1,10 +1,10 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { HasProperties } from 'src/app/domain/interfaces/has-properties'; -import { ViewMediafileMeetingUsageKey } from 'src/app/domain/models/mediafiles/mediafile.constants'; -import { Meeting } from 'src/app/domain/models/meetings/meeting'; -import { PROJECTIONDEFAULT, ProjectiondefaultValue } from 'src/app/domain/models/projector/projection-default'; -import { collectionIdFromFqid } from 'src/app/infrastructure/utils/transform-functions'; -import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization'; +import { Id } from '@app/domain/definitions/key-types'; +import { HasProperties } from '@app/domain/interfaces/has-properties'; +import { ViewMediafileMeetingUsageKey } from '@app/domain/models/mediafiles/mediafile.constants'; +import { Meeting } from '@app/domain/models/meetings/meeting'; +import { PROJECTIONDEFAULT, ProjectiondefaultValue } from '@app/domain/models/projector/projection-default'; +import { collectionIdFromFqid } from '@app/infrastructure/utils/transform-functions'; +import { ViewOrganization } from '@app/site/pages/organization/view-models/view-organization'; import { Mediafile } from '../../../../../../domain/models/mediafiles/mediafile'; import { BaseViewModel, ViewModelRelations } from '../../../../../base/base-view-model'; diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/view-models/view-meeting-mediafile.ts b/client/src/app/site/pages/meetings/pages/mediafiles/view-models/view-meeting-mediafile.ts index 1b93d671f9..40b775dc8d 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/view-models/view-meeting-mediafile.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/view-models/view-meeting-mediafile.ts @@ -1,7 +1,7 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { HasProperties } from 'src/app/domain/interfaces/has-properties'; -import { ViewMediafileMeetingUsageKey } from 'src/app/domain/models/mediafiles/mediafile.constants'; -import { PROJECTIONDEFAULT, ProjectiondefaultValue } from 'src/app/domain/models/projector/projection-default'; +import { Id } from '@app/domain/definitions/key-types'; +import { HasProperties } from '@app/domain/interfaces/has-properties'; +import { ViewMediafileMeetingUsageKey } from '@app/domain/models/mediafiles/mediafile.constants'; +import { PROJECTIONDEFAULT, ProjectiondefaultValue } from '@app/domain/models/projector/projection-default'; import { MeetingMediafile } from '../../../../../../domain/models/meeting-mediafile/meeting-mediafile'; import { BaseViewModel, ViewModelRelations } from '../../../../../base/base-view-model'; diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/meeting-settings.config.ts b/client/src/app/site/pages/meetings/pages/meeting-settings/meeting-settings.config.ts index bd977aa555..8b068db900 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/meeting-settings.config.ts +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/meeting-settings.config.ts @@ -1,5 +1,5 @@ -import { Permission } from 'src/app/domain/definitions/permission'; -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; +import { Permission } from '@app/domain/definitions/permission'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; export const MeetingSettingsAppConfig: AppConfig = { name: `settings`, diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.ts b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.ts index 3f12ec44b6..3787e8c611 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.ts +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-field/meeting-settings-group-detail-field.component.ts @@ -10,17 +10,17 @@ import { ViewEncapsulation } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; +import { Settings } from '@app/domain/models/meetings/meeting'; +import { BaseComponent } from '@app/site/base/base.component'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { MeetingSettingsDefinitionService } from '@app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service'; +import { SettingsInput } from '@app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { CollectionMapperService } from '@app/site/services/collection-mapper.service'; +import { ParentErrorStateMatcher } from '@app/ui/modules/search-selector/validators'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { distinctUntilChanged, filter, map, Observable } from 'rxjs'; -import { Settings } from 'src/app/domain/models/meetings/meeting'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { MeetingSettingsDefinitionService } from 'src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service'; -import { SettingsInput } from 'src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; -import { CollectionMapperService } from 'src/app/site/services/collection-mapper.service'; -import { ParentErrorStateMatcher } from 'src/app/ui/modules/search-selector/validators'; import { GroupControllerService } from '../../../../../participants/modules/groups/services/group-controller.service'; import { AllocationListConfig } from '../allocation-list/allocation-list.component'; diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-main/meeting-settings-group-detail-main.component.ts b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-main/meeting-settings-group-detail-main.component.ts index da6b944ce4..057cf7d801 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-main/meeting-settings-group-detail-main.component.ts +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail-main/meeting-settings-group-detail-main.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; import { getMotionWorkflowSubscriptionConfig } from '../../../../../motions/motions.subscription'; @@ -9,6 +9,7 @@ const MOTIONS_SETTINGS_GROUP = `motions`; selector: `os-meeting-settings-group-detail-main`, templateUrl: `./meeting-settings-group-detail-main.component.html`, styleUrls: [`./meeting-settings-group-detail-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MeetingSettingsGroupDetailMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail/meeting-settings-group-detail.component.ts b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail/meeting-settings-group-detail.component.ts index cb22d2c28d..30bdafe18f 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail/meeting-settings-group-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/components/meeting-settings-group-detail/meeting-settings-group-detail.component.ts @@ -8,17 +8,16 @@ import { ViewChildren } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { TranslateService } from '@ngx-translate/core'; -import { Meeting, Settings } from 'src/app/domain/models/meetings/meeting'; -import { Action } from 'src/app/gateways/actions'; -import { canPerformListUpdates } from 'src/app/gateways/repositories/base-repository'; -import { Relation, RELATIONS } from 'src/app/infrastructure/definitions/relations'; -import { ObjectReplaceKeysConfig, partitionModelsForUpdate, replaceObjectKeys } from 'src/app/infrastructure/utils'; -import { deepCopy } from 'src/app/infrastructure/utils/transform-functions'; -import { CanComponentDeactivate } from 'src/app/site/guards/watch-for-changes.guard'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; -import { MeetingSettingsDefinitionService } from 'src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service'; +import { Meeting, Settings } from '@app/domain/models/meetings/meeting'; +import { Action } from '@app/gateways/actions'; +import { canPerformListUpdates } from '@app/gateways/repositories/base-repository'; +import { Relation, RELATIONS } from '@app/infrastructure/definitions/relations'; +import { ObjectReplaceKeysConfig, partitionModelsForUpdate, replaceObjectKeys } from '@app/infrastructure/utils'; +import { deepCopy } from '@app/infrastructure/utils/transform-functions'; +import { CanComponentDeactivate } from '@app/site/guards/watch-for-changes.guard'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; +import { MeetingSettingsDefinitionService } from '@app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service'; import { isSettingsInput, SettingsGroup, @@ -27,11 +26,12 @@ import { SettingsInput, SettingsItem, SKIPPED_SETTINGS -} from 'src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { CollectionMapperService } from 'src/app/site/services/collection-mapper.service'; -import { ensureIdField } from 'src/app/site/services/relation-manager.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; +} from '@app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { CollectionMapperService } from '@app/site/services/collection-mapper.service'; +import { ensureIdField } from '@app/site/services/relation-manager.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; +import { TranslateService } from '@ngx-translate/core'; import { MeetingSettingsGroupDetailFieldComponent, diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail-routing.module.ts b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail-routing.module.ts index 07ff35b2ba..bcaddf17a6 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail-routing.module.ts +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { WatchForChangesGuard } from 'src/app/site/guards/watch-for-changes.guard'; +import { WatchForChangesGuard } from '@app/site/guards/watch-for-changes.guard'; import { MeetingSettingsGroupDetailComponent } from './components/meeting-settings-group-detail/meeting-settings-group-detail.component'; import { MeetingSettingsGroupDetailMainComponent } from './components/meeting-settings-group-detail-main/meeting-settings-group-detail-main.component'; diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail.module.ts b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail.module.ts index 9cdbcbb650..1a60c0c60d 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail.module.ts +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-detail/meeting-settings-group-detail.module.ts @@ -10,14 +10,14 @@ import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { DatepickerModule } from 'src/app/ui/modules/datepicker'; -import { EditorModule } from 'src/app/ui/modules/editor'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { OpenSlidesDateAdapterModule } from 'src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.module'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; -import { PipesModule } from 'src/app/ui/pipes'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { DatepickerModule } from '@app/ui/modules/datepicker'; +import { EditorModule } from '@app/ui/modules/editor'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { OpenSlidesDateAdapterModule } from '@app/ui/modules/openslides-date-adapter/openslides-date-adapter.module'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; +import { PipesModule } from '@app/ui/pipes'; import { AllocationListComponent } from './components/allocation-list/allocation-list.component'; import { MeetingSettingsGroupDetailComponent } from './components/meeting-settings-group-detail/meeting-settings-group-detail.component'; diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-list/components/meeting-settings-group-list/meeting-settings-group-list.component.ts b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-list/components/meeting-settings-group-list/meeting-settings-group-list.component.ts index 965ae360ad..d6d63567ae 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-list/components/meeting-settings-group-list/meeting-settings-group-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-list/components/meeting-settings-group-list/meeting-settings-group-list.component.ts @@ -1,18 +1,19 @@ -import { Component, OnInit } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; -import { MeetingSettingsDefinitionService } from 'src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; +import { MeetingSettingsDefinitionService } from '@app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service'; import { SettingsGroup, SKIPPED_SETTINGS -} from 'src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; +} from '@app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: `os-meeting-settings-group-list`, templateUrl: `./meeting-settings-group-list.component.html`, styleUrls: [`./meeting-settings-group-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MeetingSettingsGroupListComponent extends BaseMeetingComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-list/meeting-settings-group-list.module.ts b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-list/meeting-settings-group-list.module.ts index 5a8e405cab..cf134e34ea 100644 --- a/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-list/meeting-settings-group-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/meeting-settings/pages/meeting-settings-group-list/meeting-settings-group-list.module.ts @@ -3,10 +3,10 @@ import { NgModule } from '@angular/core'; import { MatCardModule } from '@angular/material/card'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { GridModule } from 'src/app/ui/modules/grid'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { GridModule } from '@app/ui/modules/grid'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; import { MeetingSettingsGroupListComponent } from './components/meeting-settings-group-list/meeting-settings-group-list.component'; import { MeetingSettingsGroupListRoutingModule } from './meeting-settings-group-list-routing.module'; diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-editor/motion-editor.component.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-editor/motion-editor.component.ts index db9edce2d5..b5b1ec34c0 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-editor/motion-editor.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-editor/motion-editor.component.ts @@ -1,5 +1,8 @@ -import { AfterViewInit, Component, forwardRef, inject } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, forwardRef, inject } from '@angular/core'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; +import { Permission } from '@app/domain/definitions/permission'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { OperatorService } from '@app/site/services/operator.service'; import OfficePaste from '@intevation/tiptap-extension-office-paste'; import { Extension } from '@tiptap/core'; import { Bold } from '@tiptap/extension-bold'; @@ -10,9 +13,6 @@ import { Italic } from '@tiptap/extension-italic'; import { Paragraph } from '@tiptap/extension-paragraph'; import { Text } from '@tiptap/extension-text'; import { UndoRedo } from '@tiptap/extensions'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { EditorComponent } from '../../../../../../../ui/modules/editor/components/editor/editor.component'; import { @@ -29,6 +29,7 @@ import { TextStyle } from '../../../../../../../ui/modules/editor/components/edi templateUrl: `../../../../../../../ui/modules/editor/components/editor/editor.component.html`, styleUrls: [`../../../../../../../ui/modules/editor/components/editor/editor.component.scss`], providers: [{ provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => MotionEditorComponent), multi: true }], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionEditorComponent extends EditorComponent implements AfterViewInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/components/motion-forward-dialog/motion-forward-dialog.component.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/components/motion-forward-dialog/motion-forward-dialog.component.ts index 3333856980..833d5df494 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/components/motion-forward-dialog/motion-forward-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/components/motion-forward-dialog/motion-forward-dialog.component.ts @@ -1,12 +1,12 @@ -import { Component, Inject, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core'; import { MatCheckboxChange } from '@angular/material/checkbox'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { Id, Ids } from '@app/domain/definitions/key-types'; +import { GetForwardingMeetingsPresenter, GetForwardingMeetingsPresenterMeeting } from '@app/gateways/presenter'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Id, Ids } from 'src/app/domain/definitions/key-types'; -import { GetForwardingMeetingsPresenter, GetForwardingMeetingsPresenterMeeting } from 'src/app/gateways/presenter'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; import { ViewMotion } from '../../../../view-models'; @@ -23,6 +23,7 @@ export interface MotionForwardDialogReturnData { selector: `os-motion-forward-dialog`, templateUrl: `./motion-forward-dialog.component.html`, styleUrls: [`./motion-forward-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionForwardDialogComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/motion-forward-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/motion-forward-dialog.module.ts index 7c3b9c5ba4..7098687d01 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/motion-forward-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/motion-forward-dialog.module.ts @@ -6,10 +6,10 @@ import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatDialogModule } from '@angular/material/dialog'; import { MatRadioModule } from '@angular/material/radio'; import { MatTableModule } from '@angular/material/table'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { MeetingTimeComponent } from 'src/app/ui/modules/meeting-time/meeting-time.component'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { MeetingTimeComponent } from '@app/ui/modules/meeting-time/meeting-time.component'; import { MotionForwardDialogComponent } from './components/motion-forward-dialog/motion-forward-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/services/motion-forward-dialog.service.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/services/motion-forward-dialog.service.ts index 00adea8923..3ba9107196 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/services/motion-forward-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/services/motion-forward-dialog.service.ts @@ -1,24 +1,24 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { TranslateService } from '@ngx-translate/core'; -import { endOfDay, fromUnixTime } from 'date-fns'; -import { BehaviorSubject, filter, firstValueFrom, Observable } from 'rxjs'; -import { Ids } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { Selectable } from 'src/app/domain/interfaces'; +import { Ids } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { Selectable } from '@app/domain/interfaces'; import { GetForwardingMeetingsPresenter, GetForwardingMeetingsPresenterMeeting, GetForwardingMeetingsPresenterService -} from 'src/app/gateways/presenter'; -import { MotionRepositoryService } from 'src/app/gateways/repositories/motions'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { ViewCommittee } from 'src/app/site/pages/organization/pages/committees'; -import { ModelRequestService } from 'src/app/site/services/model-request.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +} from '@app/gateways/presenter'; +import { MotionRepositoryService } from '@app/gateways/repositories/motions'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { ViewCommittee } from '@app/site/pages/organization/pages/committees'; +import { ModelRequestService } from '@app/site/services/model-request.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; +import { TranslateService } from '@ngx-translate/core'; +import { endOfDay, fromUnixTime } from 'date-fns'; +import { BehaviorSubject, filter, firstValueFrom, Observable } from 'rxjs'; import { MotionChangeRecommendationControllerService } from '../../../modules/change-recommendations/services'; import { getMotionForwardDataSubscriptionConfig } from '../../../motions.subscription'; diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-main/motion-main.component.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-main/motion-main.component.ts index dc6f611302..51709cf266 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-main/motion-main.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-main/motion-main.component.ts @@ -1,6 +1,6 @@ -import { Component } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfig } from 'src/app/domain/interfaces/subscription-config'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfig } from '@app/domain/interfaces/subscription-config'; import { BaseMeetingModelRequestHandler } from '../../../../base/base-meeting-model-request-handler.component'; import { @@ -14,6 +14,7 @@ import { selector: `os-motion-main`, templateUrl: `./motion-main.component.html`, styleUrls: [`./motion-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionMainComponent extends BaseMeetingModelRequestHandler { diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/components/motion-multiselect-actions/motion-multiselect-actions.component.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/components/motion-multiselect-actions/motion-multiselect-actions.component.ts index 979b14ad48..87eaac006e 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/components/motion-multiselect-actions/motion-multiselect-actions.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/components/motion-multiselect-actions/motion-multiselect-actions.component.ts @@ -1,14 +1,14 @@ -import { Component, EventEmitter, inject, Input, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, inject, Input, OnInit, Output } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { Permission } from '@app/domain/definitions/permission'; +import { PROJECTIONDEFAULT } from '@app/domain/models/projector/projection-default'; +import { ViewMotion, ViewMotionBlock, ViewMotionCategory, ViewTag } from '@app/site/pages/meetings/pages/motions'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { MultiProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models'; +import { ComponentServiceCollectorService } from '@app/site/services/component-service-collector.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; +import { SortListService } from '@app/ui/modules/list'; import { TranslateService } from '@ngx-translate/core'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { PROJECTIONDEFAULT } from 'src/app/domain/models/projector/projection-default'; -import { ViewMotion, ViewMotionBlock, ViewMotionCategory, ViewTag } from 'src/app/site/pages/meetings/pages/motions'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { MultiProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models'; -import { ComponentServiceCollectorService } from 'src/app/site/services/component-service-collector.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; -import { SortListService } from 'src/app/ui/modules/list'; import { MotionCategoryControllerService } from '../../../../modules/categories/services'; import { MotionBlockControllerService } from '../../../../modules/motion-blocks/services'; @@ -20,6 +20,7 @@ import { MotionMultiselectService } from '../../services/motion-multiselect.serv selector: `os-motion-multiselect-actions`, templateUrl: `./motion-multiselect-actions.component.html`, styleUrls: [`./motion-multiselect-actions.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionMultiselectActionsComponent extends BaseUiComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/motion-multiselect.module.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/motion-multiselect.module.ts index 348a0a50e3..2eed707a4a 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/motion-multiselect.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/motion-multiselect.module.ts @@ -3,9 +3,9 @@ import { NgModule } from '@angular/core'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ChoiceDialogComponent } from 'src/app/ui/modules/choice-dialog'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { ChoiceDialogComponent } from '@app/ui/modules/choice-dialog'; import { ProjectableListModule } from '../../../../modules/meetings-component-collector/projectable-list/projectable-list.module'; import { ProjectorButtonModule } from '../../../../modules/meetings-component-collector/projector-button/projector-button.module'; diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect-service.module.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect-service.module.ts index 0c837368aa..49ae14d38d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect-service.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect-service.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { GlobalSpinnerModule } from 'src/app/site/modules/global-spinner'; +import { GlobalSpinnerModule } from '@app/site/modules/global-spinner'; @NgModule({ imports: [GlobalSpinnerModule] }) export class MotionMultiselectServiceModule {} diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect.service.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect.service.ts index 43131ff2a8..1f45705408 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect.service.ts @@ -1,19 +1,19 @@ import { Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Id, Ids } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Selectable } from '@app/domain/interfaces/selectable'; +import { AgendaItemType } from '@app/domain/models/agenda/agenda-item'; +import { Action, ActionService } from '@app/gateways/actions'; +import { ActionRequest } from '@app/gateways/actions/action-utils'; +import { SpinnerService } from '@app/site/modules/global-spinner'; +import { ListOfSpeakersControllerService } from '@app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services'; +import { ModelRequestService } from '@app/site/services/model-request.service'; +import { ChoiceService } from '@app/ui/modules/choice-dialog'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; +import { TreeService } from '@app/ui/modules/sorting/modules/sorting-tree/services'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; -import { Id, Ids } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Selectable } from 'src/app/domain/interfaces/selectable'; -import { AgendaItemType } from 'src/app/domain/models/agenda/agenda-item'; -import { Action, ActionService } from 'src/app/gateways/actions'; -import { ActionRequest } from 'src/app/gateways/actions/action-utils'; -import { SpinnerService } from 'src/app/site/modules/global-spinner'; -import { ListOfSpeakersControllerService } from 'src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services'; -import { ModelRequestService } from 'src/app/site/services/model-request.service'; -import { ChoiceService } from 'src/app/ui/modules/choice-dialog'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; -import { TreeService } from 'src/app/ui/modules/sorting/modules/sorting-tree/services'; import { AGENDA_LIST_ITEM_MINIMAL_SUBSCRIPTION, diff --git a/client/src/app/site/pages/meetings/pages/motions/definitions/follows.ts b/client/src/app/site/pages/meetings/pages/motions/definitions/follows.ts index e4b7273324..d09f2103c0 100644 --- a/client/src/app/site/pages/meetings/pages/motions/definitions/follows.ts +++ b/client/src/app/site/pages/meetings/pages/motions/definitions/follows.ts @@ -1,5 +1,5 @@ -import { UserFieldsets } from 'src/app/domain/fieldsets/user'; -import { Follow } from 'src/app/site/services/model-request-builder'; +import { UserFieldsets } from '@app/domain/fieldsets/user'; +import { Follow } from '@app/site/services/model-request-builder'; export const GET_POSSIBLE_RECOMMENDATIONS: Follow = { idField: `workflow_id`, diff --git a/client/src/app/site/pages/meetings/pages/motions/definitions/recommendation-type-names.ts b/client/src/app/site/pages/meetings/pages/motions/definitions/recommendation-type-names.ts index 43848b414a..3cff3a6948 100644 --- a/client/src/app/site/pages/meetings/pages/motions/definitions/recommendation-type-names.ts +++ b/client/src/app/site/pages/meetings/pages/motions/definitions/recommendation-type-names.ts @@ -1,4 +1,4 @@ -import { ModificationType } from 'src/app/domain/models/motions/motions.constants'; +import { ModificationType } from '@app/domain/models/motions/motions.constants'; import { ViewMotionChangeRecommendation, ViewUnifiedChange } from '../modules'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/categories/services/motion-category-controller.service/motion-category-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/categories/services/motion-category-controller.service/motion-category-controller.service.ts index 9777335d11..1f5682c8e3 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/categories/services/motion-category-controller.service/motion-category-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/categories/services/motion-category-controller.service/motion-category-controller.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; +import { Ids } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionCategory } from '@app/domain/models/motions/motion-category'; +import { Action } from '@app/gateways/actions'; +import { MotionCategoryRepositoryService } from '@app/gateways/repositories/motions'; +import { TreeIdNode } from '@app/infrastructure/definitions/tree'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { TreeService } from '@app/ui/modules/sorting/modules/sorting-tree/services'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Ids } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionCategory } from 'src/app/domain/models/motions/motion-category'; -import { Action } from 'src/app/gateways/actions'; -import { MotionCategoryRepositoryService } from 'src/app/gateways/repositories/motions'; -import { TreeIdNode } from 'src/app/infrastructure/definitions/tree'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; -import { TreeService } from 'src/app/ui/modules/sorting/modules/sorting-tree/services'; import { ViewMotionCategory } from '../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/categories/view-models/view-motion-category.ts b/client/src/app/site/pages/meetings/pages/motions/modules/categories/view-models/view-motion-category.ts index 6546ebe024..1d62964a43 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/categories/view-models/view-motion-category.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/categories/view-models/view-motion-category.ts @@ -1,6 +1,6 @@ -import { MotionCategory } from 'src/app/domain/models/motions/motion-category'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting'; +import { MotionCategory } from '@app/domain/models/motions/motion-category'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; +import { HasMeeting } from '@app/site/pages/meetings/view-models/has-meeting'; import { ViewMotion } from '../../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/line-numbering.service/line-numbering.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/line-numbering.service/line-numbering.service.ts index 9c0e7d6ce6..77df0a4df6 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/line-numbering.service/line-numbering.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/line-numbering.service/line-numbering.service.ts @@ -1,6 +1,6 @@ import { Inject, Injectable } from '@angular/core'; +import { djb2hash } from '@app/infrastructure/utils'; import { DiffCompat, LineNumbering, VERSION } from '@openslides/motion-diff'; -import { djb2hash } from 'src/app/infrastructure/utils'; import { DiffCache } from '../../../../definitions'; import { DIFF_VERSION } from '../diff-factory.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service.ts index 46e59d76a9..d89a27907d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionChangeRecommendation } from '@app/domain/models/motions/motion-change-recommendation'; +import { ChangeRecoMode, ModificationType } from '@app/domain/models/motions/motions.constants'; +import { MotionChangeRecommendationRepositoryService } from '@app/gateways/repositories/motions'; +import { viewModelListEqual } from '@app/infrastructure/utils'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { VERSION as CURRENT_DIFF_VERSION } from '@openslides/motion-diff'; import { distinctUntilChanged, map, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionChangeRecommendation } from 'src/app/domain/models/motions/motion-change-recommendation'; -import { ChangeRecoMode, ModificationType } from 'src/app/domain/models/motions/motions.constants'; -import { MotionChangeRecommendationRepositoryService } from 'src/app/gateways/repositories/motions'; -import { viewModelListEqual } from 'src/app/infrastructure/utils'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { LineRange } from '../../../../definitions'; import { ViewMotion } from '../../../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.spec.ts b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.spec.ts index e9e701e0b0..46ed237636 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.spec.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; import { VERSION } from '@openslides/motion-diff'; -import { E2EImportsModule } from 'src/e2e-imports.module'; +import { E2EImportsModule } from '../../../../../../../../../../e2e-imports.module'; import { DIFF_VERSION } from '../diff-factory.service'; import { MotionDiffService } from './motion-diff.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.ts index bc27bca234..018865a12d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.ts @@ -1,8 +1,8 @@ import { Inject, Injectable } from '@angular/core'; +import { djb2hash } from '@app/infrastructure/utils'; +import { replaceHtmlEntities } from '@app/infrastructure/utils/dom-helpers'; import { TranslateService } from '@ngx-translate/core'; import { DiffCompat, HtmlDiff, VERSION } from '@openslides/motion-diff'; -import { djb2hash } from 'src/app/infrastructure/utils'; -import { replaceHtmlEntities } from 'src/app/infrastructure/utils/dom-helpers'; import { DiffCache, DiffLinesInParagraph, ExtractedContent, LineRange } from '../../../../definitions'; import { ViewUnifiedChange } from '../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change.ts b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change.ts index 9fe0fa092b..ea68cf5820 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change.ts @@ -1,4 +1,4 @@ -import { ModificationType } from 'src/app/domain/models/motions/motions.constants'; +import { ModificationType } from '@app/domain/models/motions/motions.constants'; import { ViewUnifiedChangeType } from '../definitions'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-controller.service.ts index 5238038752..02c928d073 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-controller.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionComment } from 'src/app/domain/models/motions/motion-comment'; -import { MotionCommentRepositoryService } from 'src/app/gateways/repositories/motions'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionComment } from '@app/domain/models/motions/motion-comment'; +import { MotionCommentRepositoryService } from '@app/gateways/repositories/motions'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { ViewMotionComment } from '../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-section-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-section-controller.service.ts index 4b1d6e4a9e..83750447a6 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-section-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-section-controller.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionCommentSection } from 'src/app/domain/models/motions/motion-comment-section'; -import { MotionCommentSectionRepositoryService } from 'src/app/gateways/repositories/motions'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionCommentSection } from '@app/domain/models/motions/motion-comment-section'; +import { MotionCommentSectionRepositoryService } from '@app/gateways/repositories/motions'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { ViewMotionCommentSection } from '../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/editors/services/motion-editor-controller/motion-editor-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/editors/services/motion-editor-controller/motion-editor-controller.service.ts index a705cd4518..9f8652afac 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/editors/services/motion-editor-controller/motion-editor-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/editors/services/motion-editor-controller/motion-editor-controller.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { MotionEditor } from 'src/app/domain/models/motions/motion-editor'; -import { MotionEditorRepositoryService } from 'src/app/gateways/repositories/motions'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; +import { MotionEditor } from '@app/domain/models/motions/motion-editor'; +import { MotionEditorRepositoryService } from '@app/gateways/repositories/motions'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; import { BaseMotionMeetingUserControllerService } from '../../../util'; import { ViewMotionEditor } from '../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/editors/view-models/view-motion-editor.ts b/client/src/app/site/pages/meetings/pages/motions/modules/editors/view-models/view-motion-editor.ts index 736c3ef30f..e2be8467ae 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/editors/view-models/view-motion-editor.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/editors/view-models/view-motion-editor.ts @@ -1,6 +1,6 @@ -import { MotionEditor } from 'src/app/domain/models/motions/motion-editor'; -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { BaseHasMeetingUserViewModel } from 'src/app/site/pages/meetings/base/base-has-meeting-user-view-model'; +import { MotionEditor } from '@app/domain/models/motions/motion-editor'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; +import { BaseHasMeetingUserViewModel } from '@app/site/pages/meetings/base/base-has-meeting-user-view-model'; import { HasMeeting } from '../../../../../view-models/has-meeting'; import { ViewMotion } from '../../../view-models/view-motion'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/services/motion-block-controller.service/motion-block-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/services/motion-block-controller.service/motion-block-controller.service.ts index 48cb81e4ef..b38496de73 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/services/motion-block-controller.service/motion-block-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/services/motion-block-controller.service/motion-block-controller.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionBlock } from 'src/app/domain/models/motions/motion-block'; -import { MotionBlockRepositoryService } from 'src/app/gateways/repositories/motions'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionBlock } from '@app/domain/models/motions/motion-block'; +import { MotionBlockRepositoryService } from '@app/gateways/repositories/motions'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { MotionControllerService } from '../../../../services/common/motion-controller.service/motion-controller.service'; import { ViewMotionBlock } from '../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/view-models/view-motion-block.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/view-models/view-motion-block.ts index 73965fcffe..0429fbc514 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/view-models/view-motion-block.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/view-models/view-motion-block.ts @@ -1,5 +1,5 @@ -import { PROJECTIONDEFAULT, ProjectiondefaultValue } from 'src/app/domain/models/projector/projection-default'; -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { PROJECTIONDEFAULT, ProjectiondefaultValue } from '@app/domain/models/projector/projection-default'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; import { MotionBlock } from '../../../../../../../../domain/models/motions/motion-block'; import { BaseProjectableViewModel } from '../../../../../view-models/base-projectable-model'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-detail-content/motion-poll-detail-content.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-detail-content/motion-poll-detail-content.component.ts index 2f2747ea62..e3ef2952f9 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-detail-content/motion-poll-detail-content.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-detail-content/motion-poll-detail-content.component.ts @@ -1,14 +1,14 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; +import { VOTE_UNDOCUMENTED } from '@app/domain/models/poll'; +import { PollData } from '@app/domain/models/poll/generic-poll'; +import { PollState, PollTableData } from '@app/domain/models/poll/poll-constants'; +import { ChartData } from '@app/site/pages/meetings/modules/poll/components/chart/chart.component'; +import { PollService } from '@app/site/pages/meetings/modules/poll/services/poll.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ThemeService } from '@app/site/services/theme.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { combineLatestWith, map } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { VOTE_UNDOCUMENTED } from 'src/app/domain/models/poll'; -import { PollData } from 'src/app/domain/models/poll/generic-poll'; -import { PollState, PollTableData } from 'src/app/domain/models/poll/poll-constants'; -import { ChartData } from 'src/app/site/pages/meetings/modules/poll/components/chart/chart.component'; -import { PollService } from 'src/app/site/pages/meetings/modules/poll/services/poll.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ThemeService } from 'src/app/site/services/theme.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { MotionPollService } from '../../services'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.ts index 86488f55f6..c50561dede 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-dialog/motion-poll-dialog.component.ts @@ -1,11 +1,11 @@ -import { AfterViewInit, Component, Inject } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { BaseModel } from '@app/domain/models/base/base-model'; +import { PollPercentBaseVerbose, VoteValue } from '@app/domain/models/poll'; +import { BasePollDialogComponent } from '@app/site/pages/meetings/modules/poll/base/base-poll-dialog.component'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; import { _ } from '@ngx-translate/core'; -import { BaseModel } from 'src/app/domain/models/base/base-model'; -import { PollPercentBaseVerbose, VoteValue } from 'src/app/domain/models/poll'; -import { BasePollDialogComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.component'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; import { MotionPollService } from '../../services'; @@ -18,6 +18,7 @@ export const MotionPollMethodsVerbose = { selector: `os-motion-poll-dialog`, templateUrl: `./motion-poll-dialog.component.html`, styleUrls: [`./motion-poll-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionPollDialogComponent extends BasePollDialogComponent implements AfterViewInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-form/motion-poll-form.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-form/motion-poll-form.component.ts index e2bbf7f357..d68a442c6a 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-form/motion-poll-form.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-form/motion-poll-form.component.ts @@ -1,10 +1,10 @@ -import { Component, ViewEncapsulation } from '@angular/core'; -import { _ } from '@ngx-translate/core'; -import { PollPropertyVerboseKey } from 'src/app/domain/models/poll'; +import { ChangeDetectionStrategy, Component, ViewEncapsulation } from '@angular/core'; +import { PollPropertyVerboseKey } from '@app/domain/models/poll'; import { BasePollFormComponent, PollFormHideSelectsData -} from 'src/app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component'; +} from '@app/site/pages/meetings/modules/poll/components/base-poll-form/base-poll-form.component'; +import { _ } from '@ngx-translate/core'; @Component({ selector: `os-motion-poll-form`, @@ -12,6 +12,7 @@ import { styleUrls: [`../../../../../../modules/poll/components/base-poll-form/base-poll-form.component.scss`], providers: [{ provide: BasePollFormComponent, useExisting: MotionPollFormComponent }], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionPollFormComponent extends BasePollFormComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.ts index c46626dfe6..71e171d6d8 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-meta-information/motion-poll-meta-information.component.ts @@ -1,10 +1,11 @@ -import { Component } from '@angular/core'; -import { BasePollMetaInformationComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BasePollMetaInformationComponent } from '@app/site/pages/meetings/modules/poll/base/base-poll-meta-information.component'; @Component({ selector: `os-motion-poll-meta-information`, templateUrl: `./motion-poll-meta-information.component.html`, styleUrls: [`./motion-poll-meta-information.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionPollMetaInformationComponent extends BasePollMetaInformationComponent {} diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-vote/motion-poll-vote.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-vote/motion-poll-vote.component.ts index 76397fd9b1..2f9cbb4c01 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-vote/motion-poll-vote.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll-vote/motion-poll-vote.component.ts @@ -1,13 +1,13 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { VoteValue } from 'src/app/domain/models/poll/vote-constants'; +import { Id } from '@app/domain/definitions/key-types'; +import { VoteValue } from '@app/domain/models/poll/vote-constants'; import { BasePollVoteComponent, VoteOption -} from 'src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; +} from '@app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { ViewOption } from '../../../../../polls'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.ts index e41b88413e..b173f43b9d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/components/motion-poll/motion-poll.component.ts @@ -1,10 +1,10 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { PollState, VOTE_MAJORITY } from '@app/domain/models/poll'; +import { BasePollComponent } from '@app/site/pages/meetings/modules/poll/base/base-poll.component'; +import { OperatorService } from '@app/site/services/operator.service'; import { TranslateService } from '@ngx-translate/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { PollState, VOTE_MAJORITY } from 'src/app/domain/models/poll'; -import { BasePollComponent } from 'src/app/site/pages/meetings/modules/poll/base/base-poll.component'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { VotingPrivacyWarningDialogService } from '../../../../../../modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service'; import { ViewPoll } from '../../../../../polls'; @@ -15,6 +15,7 @@ import { MotionPollPdfService } from '../../services/motion-poll-pdf.service/mot selector: `os-motion-poll`, templateUrl: `./motion-poll.component.html`, styleUrls: [`./motion-poll.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionPollComponent extends BasePollComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts index 0837821385..a7da42b322 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/motion-poll.module.ts @@ -15,16 +15,16 @@ import { MatRadioModule } from '@angular/material/radio'; import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { PollModule } from 'src/app/site/pages/meetings/modules/poll'; -import { PollService } from 'src/app/site/pages/meetings/modules/poll/services/poll.service'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { CustomIconComponent } from 'src/app/ui/modules/custom-icon'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; -import { PipesModule } from 'src/app/ui/pipes'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { PollModule } from '@app/site/pages/meetings/modules/poll'; +import { PollService } from '@app/site/pages/meetings/modules/poll/services/poll.service'; +import { DirectivesModule } from '@app/ui/directives'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { CustomIconComponent } from '@app/ui/modules/custom-icon'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; +import { PipesModule } from '@app/ui/pipes'; import { MotionPollComponent } from './components/motion-poll/motion-poll.component'; import { MotionPollDetailContentComponent } from './components/motion-poll-detail-content/motion-poll-detail-content.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.ts index 24318c6090..9fe6f22604 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { Fqid } from 'src/app/domain/definitions/key-types'; -import { PollClassType } from 'src/app/domain/models/poll/poll-constants'; -import { PollRepositoryService } from 'src/app/gateways/repositories/polls/poll-repository.service'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; +import { Fqid } from '@app/domain/definitions/key-types'; +import { PollClassType } from '@app/domain/models/poll/poll-constants'; +import { PollRepositoryService } from '@app/gateways/repositories/polls/poll-repository.service'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; @Injectable({ providedIn: `root` diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-dialog.service/motion-poll-dialog.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-dialog.service/motion-poll-dialog.service.ts index 910d387ca0..2b14a21277 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-dialog.service/motion-poll-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-dialog.service/motion-poll-dialog.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { BasePollDialogService } from 'src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; +import { BasePollDialogService } from '@app/site/pages/meetings/modules/poll/base/base-poll-dialog.service'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; import { MotionPollDialogComponent } from '../../components/motion-poll-dialog/motion-poll-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-pdf.service/motion-poll-pdf.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-pdf.service/motion-poll-pdf.service.ts index 23497049f1..76a92cdcef 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-pdf.service/motion-poll-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-pdf.service/motion-poll-pdf.service.ts @@ -1,10 +1,7 @@ import { Injectable } from '@angular/core'; +import { AbstractPollData, BasePollPdfService } from '@app/site/pages/meetings/modules/poll/base/base-poll-pdf.service'; +import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; import { TranslateService } from '@ngx-translate/core'; -import { - AbstractPollData, - BasePollPdfService -} from 'src/app/site/pages/meetings/modules/poll/base/base-poll-pdf.service'; -import { ViewPoll } from 'src/app/site/pages/meetings/pages/polls'; import { MotionControllerService } from '../../../../services/common/motion-controller.service/motion-controller.service'; import { ViewMotion } from '../../../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-service.module.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-service.module.ts index a10be023cd..c79badfc82 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-service.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-service.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { PollModule } from 'src/app/site/pages/meetings/modules/poll'; -import { MeetingExportModule } from 'src/app/site/pages/meetings/services/export'; +import { PollModule } from '@app/site/pages/meetings/modules/poll'; +import { MeetingExportModule } from '@app/site/pages/meetings/services/export'; @NgModule({ imports: [CommonModule, PollModule, MeetingExportModule] }) export class MotionPollServiceModule { diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts index cad9479845..684d621597 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts @@ -1,9 +1,7 @@ import { Injectable } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; -import { map, merge, Observable, of } from 'rxjs'; -import { Motion } from 'src/app/domain/models/motions/motion'; -import { OptionData, OptionDataKey, PollData, PollDataKey } from 'src/app/domain/models/poll/generic-poll'; -import { Poll } from 'src/app/domain/models/poll/poll'; +import { Motion } from '@app/domain/models/motions/motion'; +import { OptionData, OptionDataKey, PollData, PollDataKey } from '@app/domain/models/poll/generic-poll'; +import { Poll } from '@app/domain/models/poll/poll'; import { ABSTAIN_KEY, CalculablePollKey, @@ -16,9 +14,11 @@ import { VOTE_MAJORITY, VotingResult, YES_KEY -} from 'src/app/domain/models/poll/poll-constants'; -import { PollService } from 'src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; +} from '@app/domain/models/poll/poll-constants'; +import { PollService } from '@app/site/pages/meetings/modules/poll/services/poll.service/poll.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { TranslateService } from '@ngx-translate/core'; +import { map, merge, Observable, of } from 'rxjs'; import { MotionPollControllerService } from '../motion-poll-controller.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service.ts index 66cb6592eb..d1505fe419 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; +import { Fqid } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { PersonalNote } from '@app/domain/models/motions/personal-note'; +import { Action } from '@app/gateways/actions'; +import { PersonalNoteRepositoryService } from '@app/gateways/repositories/motions/personal-note-repository.service'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { map, Observable } from 'rxjs'; -import { Fqid } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { PersonalNote } from 'src/app/domain/models/motions/personal-note'; -import { Action } from 'src/app/gateways/actions'; -import { PersonalNoteRepositoryService } from 'src/app/gateways/repositories/motions/personal-note-repository.service'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { HasPersonalNote, ViewPersonalNote } from '../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/view-models/has-personal-note.ts b/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/view-models/has-personal-note.ts index 4ff465a58e..60e7edc55b 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/view-models/has-personal-note.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/view-models/has-personal-note.ts @@ -1,5 +1,5 @@ -import { HasPersonalNoteIds } from 'src/app/domain/interfaces'; -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { HasPersonalNoteIds } from '@app/domain/interfaces'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; import { ViewPersonalNote } from './view-personal-note'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/view-models/view-personal-note.ts b/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/view-models/view-personal-note.ts index 25b520ee83..0e19dcd106 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/view-models/view-personal-note.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/view-models/view-personal-note.ts @@ -1,4 +1,4 @@ -import { BaseHasMeetingUserViewModel } from 'src/app/site/pages/meetings/base/base-has-meeting-user-view-model'; +import { BaseHasMeetingUserViewModel } from '@app/site/pages/meetings/base/base-has-meeting-user-view-model'; import { PersonalNote } from '../../../../../../../../domain/models/motions/personal-note'; import { BaseViewModel, ViewModelRelations } from '../../../../../../../base/base-view-model'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/states/services/motion-state-controller.service/motion-state-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/states/services/motion-state-controller.service/motion-state-controller.service.ts index da7350eee5..d25b72e9b2 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/states/services/motion-state-controller.service/motion-state-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/states/services/motion-state-controller.service/motion-state-controller.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionState } from 'src/app/domain/models/motions/motion-state'; -import { Action } from 'src/app/gateways/actions'; -import { MotionStateRepositoryService } from 'src/app/gateways/repositories/motions'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionState } from '@app/domain/models/motions/motion-state'; +import { Action } from '@app/gateways/actions'; +import { MotionStateRepositoryService } from '@app/gateways/repositories/motions'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { ViewMotionState } from '../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/submitters/services/motion-submitter-controller/motion-submitter-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/submitters/services/motion-submitter-controller/motion-submitter-controller.service.ts index 6f12da3822..b8622b047a 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/submitters/services/motion-submitter-controller/motion-submitter-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/submitters/services/motion-submitter-controller/motion-submitter-controller.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { MotionSubmitter } from 'src/app/domain/models/motions/motion-submitter'; -import { MotionSubmitterRepositoryService } from 'src/app/gateways/repositories/motions'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; +import { MotionSubmitter } from '@app/domain/models/motions/motion-submitter'; +import { MotionSubmitterRepositoryService } from '@app/gateways/repositories/motions'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; import { BaseMotionMeetingUserControllerService } from '../../../util'; import { ViewMotionSubmitter } from '../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/submitters/view-models/view-motion-submitter.ts b/client/src/app/site/pages/meetings/pages/motions/modules/submitters/view-models/view-motion-submitter.ts index 2c86206483..9d139296f7 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/submitters/view-models/view-motion-submitter.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/submitters/view-models/view-motion-submitter.ts @@ -1,5 +1,5 @@ -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { BaseHasMeetingUserViewModel } from 'src/app/site/pages/meetings/base/base-has-meeting-user-view-model'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; +import { BaseHasMeetingUserViewModel } from '@app/site/pages/meetings/base/base-has-meeting-user-view-model'; import { MotionSubmitter } from '../../../../../../../../domain/models/motions/motion-submitter'; import { HasMeeting } from '../../../../../view-models/has-meeting'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/supporters/services/motion-supporter-controller/motion-supporter-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/supporters/services/motion-supporter-controller/motion-supporter-controller.service.ts index 277372e2ac..6020fbf96c 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/supporters/services/motion-supporter-controller/motion-supporter-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/supporters/services/motion-supporter-controller/motion-supporter-controller.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionSupporter } from 'src/app/domain/models/motions/motion-supporter'; -import { Action } from 'src/app/gateways/actions'; -import { MotionSupporterRepositoryService } from 'src/app/gateways/repositories/motions/motion-supporter'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionSupporter } from '@app/domain/models/motions/motion-supporter'; +import { Action } from '@app/gateways/actions'; +import { MotionSupporterRepositoryService } from '@app/gateways/repositories/motions/motion-supporter'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; import { ViewMotion } from '../../../../view-models'; import { ViewMotionSupporter } from '../../view-models/view-motion-supporter'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/supporters/view-models/view-motion-supporter.ts b/client/src/app/site/pages/meetings/pages/motions/modules/supporters/view-models/view-motion-supporter.ts index 2d8d6fbf43..2fb43d3fb1 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/supporters/view-models/view-motion-supporter.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/supporters/view-models/view-motion-supporter.ts @@ -1,6 +1,6 @@ -import { MotionSupporter } from 'src/app/domain/models/motions/motion-supporter'; -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { BaseHasMeetingUserViewModel } from 'src/app/site/pages/meetings/base/base-has-meeting-user-view-model'; +import { MotionSupporter } from '@app/domain/models/motions/motion-supporter'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; +import { BaseHasMeetingUserViewModel } from '@app/site/pages/meetings/base/base-has-meeting-user-view-model'; import { HasMeeting } from '../../../../../view-models/has-meeting'; import { ViewMotion } from '../../../view-models/view-motion'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/tags/services/tag-controller.service/tag-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/tags/services/tag-controller.service/tag-controller.service.ts index 916f6d3ad1..3a056d7f3d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/tags/services/tag-controller.service/tag-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/tags/services/tag-controller.service/tag-controller.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Tag } from 'src/app/domain/models/tag/tag'; -import { TagRepositoryService } from 'src/app/gateways/repositories/tags/tag-repository.service'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { Identifiable } from '@app/domain/interfaces'; +import { Tag } from '@app/domain/models/tag/tag'; +import { TagRepositoryService } from '@app/gateways/repositories/tags/tag-repository.service'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { ViewTag } from '../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/tags/view-models/has-tags.ts b/client/src/app/site/pages/meetings/pages/motions/modules/tags/view-models/has-tags.ts index 40e6a7813a..c4d1998e65 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/tags/view-models/has-tags.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/tags/view-models/has-tags.ts @@ -1,4 +1,4 @@ -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; import { HasTagIds } from '../../../../../../../../domain/interfaces/has-tag-ids'; import { ViewTag } from './view-tag'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/tags/view-models/view-tag.ts b/client/src/app/site/pages/meetings/pages/motions/modules/tags/view-models/view-tag.ts index 0397bdb019..bb9316a069 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/tags/view-models/view-tag.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/tags/view-models/view-tag.ts @@ -1,6 +1,6 @@ -import { Tag } from 'src/app/domain/models/tag/tag'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting'; +import { Tag } from '@app/domain/models/tag/tag'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { HasMeeting } from '@app/site/pages/meetings/view-models/has-meeting'; import { HasTags } from './has-tags'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/util.ts b/client/src/app/site/pages/meetings/pages/motions/modules/util.ts index 6860c8e8a3..f9519de3c0 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/util.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/util.ts @@ -1,10 +1,10 @@ -import { Identifiable } from 'src/app/domain/interfaces'; -import { BaseModel, ModelConstructor } from 'src/app/domain/models/base/base-model'; -import { Action } from 'src/app/gateways/actions'; -import { BaseMotionMeetingUserRepositoryService } from 'src/app/gateways/repositories/motions/util'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; +import { Identifiable } from '@app/domain/interfaces'; +import { BaseModel, ModelConstructor } from '@app/domain/models/base/base-model'; +import { Action } from '@app/gateways/actions'; +import { BaseMotionMeetingUserRepositoryService } from '@app/gateways/repositories/motions/util'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; import { BaseHasMeetingUserViewModel } from '../../../base/base-has-meeting-user-view-model'; import { ViewMotion } from '../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/workflows/services/motion-workflow-controller.service/motion-workflow-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/workflows/services/motion-workflow-controller.service/motion-workflow-controller.service.ts index a5b75abc75..459aff55de 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/workflows/services/motion-workflow-controller.service/motion-workflow-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/workflows/services/motion-workflow-controller.service/motion-workflow-controller.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionWorkflow } from 'src/app/domain/models/motions/motion-workflow'; -import { Action } from 'src/app/gateways/actions'; -import { MotionWorkflowRepositoryService } from 'src/app/gateways/repositories/motions'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionWorkflow } from '@app/domain/models/motions/motion-workflow'; +import { Action } from '@app/gateways/actions'; +import { MotionWorkflowRepositoryService } from '@app/gateways/repositories/motions'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { ViewMotion } from '../../../../view-models'; import { ViewMotionState } from '../../../states'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/workflows/view-models/view-motion-workflow.ts b/client/src/app/site/pages/meetings/pages/motions/modules/workflows/view-models/view-motion-workflow.ts index 8dd4cb046e..6febf94c6e 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/workflows/view-models/view-motion-workflow.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/workflows/view-models/view-motion-workflow.ts @@ -1,8 +1,8 @@ -import { MotionWorkflow } from 'src/app/domain/models/motions/motion-workflow'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { ViewMotionState } from 'src/app/site/pages/meetings/pages/motions'; -import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; +import { MotionWorkflow } from '@app/domain/models/motions/motion-workflow'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; +import { ViewMotionState } from '@app/site/pages/meetings/pages/motions'; +import { HasMeeting } from '@app/site/pages/meetings/view-models/has-meeting'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; export class ViewMotionWorkflow extends BaseViewModel { public static COLLECTION = MotionWorkflow.COLLECTION; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/services/motion-working-group-speaker-controller/motion-working-group-speaker-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/services/motion-working-group-speaker-controller/motion-working-group-speaker-controller.service.ts index 3bdd1bb414..e4902a6833 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/services/motion-working-group-speaker-controller/motion-working-group-speaker-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/services/motion-working-group-speaker-controller/motion-working-group-speaker-controller.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; -import { MotionWorkingGroupSpeaker } from 'src/app/domain/models/motions/motion-working-group-speaker'; -import { MotionWorkingGroupSpeakerRepositoryService } from 'src/app/gateways/repositories/motions'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; +import { MotionWorkingGroupSpeaker } from '@app/domain/models/motions/motion-working-group-speaker'; +import { MotionWorkingGroupSpeakerRepositoryService } from '@app/gateways/repositories/motions'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; import { BaseMotionMeetingUserControllerService } from '../../../util'; import { ViewMotionWorkingGroupSpeaker } from '../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/view-models/view-motion-working-group-speaker.ts b/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/view-models/view-motion-working-group-speaker.ts index 7f147dde82..82fb29576a 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/view-models/view-motion-working-group-speaker.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/view-models/view-motion-working-group-speaker.ts @@ -1,6 +1,6 @@ -import { MotionWorkingGroupSpeaker } from 'src/app/domain/models/motions/motion-working-group-speaker'; -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { BaseHasMeetingUserViewModel } from 'src/app/site/pages/meetings/base/base-has-meeting-user-view-model'; +import { MotionWorkingGroupSpeaker } from '@app/domain/models/motions/motion-working-group-speaker'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; +import { BaseHasMeetingUserViewModel } from '@app/site/pages/meetings/base/base-has-meeting-user-view-model'; import { HasMeeting } from '../../../../../view-models/has-meeting'; import { ViewMotion } from '../../../view-models/view-motion'; diff --git a/client/src/app/site/pages/meetings/pages/motions/motions-routing.module.ts b/client/src/app/site/pages/meetings/pages/motions/motions-routing.module.ts index 2a26036191..5d4c12fd23 100644 --- a/client/src/app/site/pages/meetings/pages/motions/motions-routing.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/motions-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Permission } from 'src/app/domain/definitions/permission'; +import { Permission } from '@app/domain/definitions/permission'; import { MotionMainComponent } from './components/motion-main/motion-main.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/motions.config.ts b/client/src/app/site/pages/meetings/pages/motions/motions.config.ts index 086590b82e..8a5bdfc181 100644 --- a/client/src/app/site/pages/meetings/pages/motions/motions.config.ts +++ b/client/src/app/site/pages/meetings/pages/motions/motions.config.ts @@ -1,18 +1,18 @@ -import { Permission } from 'src/app/domain/definitions/permission'; -import { Motion } from 'src/app/domain/models/motions/motion'; -import { MotionBlock } from 'src/app/domain/models/motions/motion-block'; -import { MotionCategory } from 'src/app/domain/models/motions/motion-category'; -import { MotionChangeRecommendation } from 'src/app/domain/models/motions/motion-change-recommendation'; -import { MotionComment } from 'src/app/domain/models/motions/motion-comment'; -import { MotionCommentSection } from 'src/app/domain/models/motions/motion-comment-section'; -import { MotionEditor } from 'src/app/domain/models/motions/motion-editor'; -import { MotionState } from 'src/app/domain/models/motions/motion-state'; -import { MotionSubmitter } from 'src/app/domain/models/motions/motion-submitter'; -import { MotionSupporter } from 'src/app/domain/models/motions/motion-supporter'; -import { MotionWorkflow } from 'src/app/domain/models/motions/motion-workflow'; -import { MotionWorkingGroupSpeaker } from 'src/app/domain/models/motions/motion-working-group-speaker'; -import { PersonalNote } from 'src/app/domain/models/motions/personal-note'; -import { Tag } from 'src/app/domain/models/tag/tag'; +import { Permission } from '@app/domain/definitions/permission'; +import { Motion } from '@app/domain/models/motions/motion'; +import { MotionBlock } from '@app/domain/models/motions/motion-block'; +import { MotionCategory } from '@app/domain/models/motions/motion-category'; +import { MotionChangeRecommendation } from '@app/domain/models/motions/motion-change-recommendation'; +import { MotionComment } from '@app/domain/models/motions/motion-comment'; +import { MotionCommentSection } from '@app/domain/models/motions/motion-comment-section'; +import { MotionEditor } from '@app/domain/models/motions/motion-editor'; +import { MotionState } from '@app/domain/models/motions/motion-state'; +import { MotionSubmitter } from '@app/domain/models/motions/motion-submitter'; +import { MotionSupporter } from '@app/domain/models/motions/motion-supporter'; +import { MotionWorkflow } from '@app/domain/models/motions/motion-workflow'; +import { MotionWorkingGroupSpeaker } from '@app/domain/models/motions/motion-working-group-speaker'; +import { PersonalNote } from '@app/domain/models/motions/personal-note'; +import { Tag } from '@app/domain/models/tag/tag'; import { MotionBlockRepositoryService, MotionCategoryRepositoryService, @@ -25,11 +25,11 @@ import { MotionSubmitterRepositoryService, MotionWorkflowRepositoryService, MotionWorkingGroupSpeakerRepositoryService -} from 'src/app/gateways/repositories/motions'; -import { MotionSupporterRepositoryService } from 'src/app/gateways/repositories/motions/motion-supporter'; -import { PersonalNoteRepositoryService } from 'src/app/gateways/repositories/motions/personal-note-repository.service'; -import { TagRepositoryService } from 'src/app/gateways/repositories/tags'; -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; +} from '@app/gateways/repositories/motions'; +import { MotionSupporterRepositoryService } from '@app/gateways/repositories/motions/motion-supporter'; +import { PersonalNoteRepositoryService } from '@app/gateways/repositories/motions/personal-note-repository.service'; +import { TagRepositoryService } from '@app/gateways/repositories/tags'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; import { ViewMotionBlock, diff --git a/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts b/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts index 7b02651a7b..1e1c6e13e8 100644 --- a/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/motions/motions.subscription.ts @@ -1,8 +1,8 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { FULL_FIELDSET } from 'src/app/domain/fieldsets/misc'; -import { MeetingUserFieldsets } from 'src/app/domain/fieldsets/user'; -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; +import { Id } from '@app/domain/definitions/key-types'; +import { FULL_FIELDSET } from '@app/domain/fieldsets/misc'; +import { MeetingUserFieldsets } from '@app/domain/fieldsets/user'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; import { listOfSpeakersSpeakerCountSubscription } from '../agenda/agenda.subscription'; import { pollModelRequest } from '../polls/polls.subscription'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/amendments/amendments-routing.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/amendments/amendments-routing.module.ts index 57e310c3af..0443c021fb 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/amendments/amendments-routing.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/amendments/amendments-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Permission } from 'src/app/domain/definitions/permission'; +import { Permission } from '@app/domain/definitions/permission'; import { MotionExportComponent } from '../motion-export/components/motion-export/motion-export.component'; import { AmendmentListComponent } from './components/amendment-list/amendment-list.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/amendments/amendments.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/amendments/amendments.module.ts index f0796c011f..ad9dc25b42 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/amendments/amendments.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/amendments/amendments.module.ts @@ -4,11 +4,11 @@ import { MatChipsModule } from '@angular/material/chips'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { PipesModule } from 'src/app/ui/pipes/pipes.module'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { DirectivesModule } from '@app/ui/directives'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { PipesModule } from '@app/ui/pipes/pipes.module'; import { MotionMultiselectModule } from '../../components/motion-multiselect/motion-multiselect.module'; import { MotionsExportModule } from '../../services/export/motions-export.module'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/amendments/components/amendment-list-main/amendment-list-main.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/amendments/components/amendment-list-main/amendment-list-main.component.ts index 892d8d40ab..0fc8323478 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/amendments/components/amendment-list-main/amendment-list-main.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/amendments/components/amendment-list-main/amendment-list-main.component.ts @@ -1,7 +1,7 @@ -import { Component } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfig } from 'src/app/domain/interfaces/subscription-config'; -import { BaseMeetingModelRequestHandler } from 'src/app/site/pages/meetings/base/base-meeting-model-request-handler.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfig } from '@app/domain/interfaces/subscription-config'; +import { BaseMeetingModelRequestHandler } from '@app/site/pages/meetings/base/base-meeting-model-request-handler.component'; import { getAmendmentListSubscriptionConfig } from '../../../../motions.subscription'; @@ -9,6 +9,7 @@ import { getAmendmentListSubscriptionConfig } from '../../../../motions.subscrip selector: `os-motion-main`, templateUrl: `./amendment-list-main.component.html`, styleUrls: [`./amendment-list-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AmendmentListMainComponent extends BaseMeetingModelRequestHandler { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/amendments/components/amendment-list/amendment-list.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/amendments/components/amendment-list/amendment-list.component.ts index 70e5de6e56..31d5d7605d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/amendments/components/amendment-list/amendment-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/amendments/components/amendment-list/amendment-list.component.ts @@ -1,11 +1,11 @@ -import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute, ParamMap } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { ItemTypeChoices } from '@app/domain/models/agenda/agenda-item'; +import { BaseMeetingListViewComponent } from '@app/site/pages/meetings/base/base-meeting-list-view.component'; +import { ProjectableListComponent } from '@app/site/pages/meetings/modules/meetings-component-collector/projectable-list/components/projectable-list/projectable-list.component'; import { TranslateService } from '@ngx-translate/core'; import { Observable, of, switchMap } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { ItemTypeChoices } from 'src/app/domain/models/agenda/agenda-item'; -import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; -import { ProjectableListComponent } from 'src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/components/projectable-list/projectable-list.component'; import { ChangeRecoMode } from '../../../../../../../../../domain/models/motions/motions.constants'; import { MotionMultiselectService } from '../../../../components/motion-multiselect/services/motion-multiselect.service'; @@ -25,6 +25,7 @@ const AMENDMENT_LIST_STORAGE_INDEX = `amendment_list`; templateUrl: `./amendment-list.component.html`, styleUrls: [`./amendment-list.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AmendmentListComponent extends BaseMeetingListViewComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/categories/categories-routing.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/categories/categories-routing.module.ts index 1f8716cbd9..d9588e4649 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/categories/categories-routing.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/categories/categories-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { WatchForChangesGuard } from 'src/app/site/guards/watch-for-changes.guard'; +import { WatchForChangesGuard } from '@app/site/guards/watch-for-changes.guard'; import { CategoryDetailComponent } from './components/category-detail/category-detail.component'; import { CategoryDetailSortComponent } from './components/category-detail-sort/category-detail-sort.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/categories/categories.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/categories/categories.module.ts index 73e283f708..b6816e186b 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/categories/categories.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/categories/categories.module.ts @@ -11,12 +11,12 @@ import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; import { MatTableModule } from '@angular/material/table'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ChoiceDialogComponent } from 'src/app/ui/modules/choice-dialog'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { SortingModule } from 'src/app/ui/modules/sorting'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { DirectivesModule } from '@app/ui/directives'; +import { ChoiceDialogComponent } from '@app/ui/modules/choice-dialog'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { SortingModule } from '@app/ui/modules/sorting'; import { CategoriesRoutingModule } from './categories-routing.module'; import { CategoryDetailComponent } from './components/category-detail/category-detail.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail-sort/category-detail-sort.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail-sort/category-detail-sort.component.ts index cd4eb1d8d6..63506f1d70 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail-sort/category-detail-sort.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail-sort/category-detail-sort.component.ts @@ -1,14 +1,14 @@ -import { Component, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { CanComponentDeactivate } from '@app/site/guards/watch-for-changes.guard'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewMotion, ViewMotionCategory } from '@app/site/pages/meetings/pages/motions'; +import { ChoiceService } from '@app/ui/modules/choice-dialog'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; +import { SortingListComponent } from '@app/ui/modules/sorting/modules/sorting-list/components/sorting-list/sorting-list.component'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { CanComponentDeactivate } from 'src/app/site/guards/watch-for-changes.guard'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewMotion, ViewMotionCategory } from 'src/app/site/pages/meetings/pages/motions'; -import { ChoiceService } from 'src/app/ui/modules/choice-dialog'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; -import { SortingListComponent } from 'src/app/ui/modules/sorting/modules/sorting-list/components/sorting-list/sorting-list.component'; import { MotionCategoryControllerService } from '../../../../modules/categories/services'; import { MotionControllerService } from '../../../../services/common/motion-controller.service'; @@ -22,6 +22,7 @@ import { MotionControllerService } from '../../../../services/common/motion-cont selector: `os-category-detail-sort`, templateUrl: `./category-detail-sort.component.html`, styleUrls: [`./category-detail-sort.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CategoryDetailSortComponent extends BaseMeetingComponent implements CanComponentDeactivate { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail/category-detail.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail/category-detail.component.ts index 3ecc0e0d48..1a3f24dea5 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail/category-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail/category-detail.component.ts @@ -1,16 +1,16 @@ -import { Component, TemplateRef, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, TemplateRef, ViewChild } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { MatTableDataSource } from '@angular/material/table'; import { ActivatedRoute } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewMotion, ViewMotionCategory } from '@app/site/pages/meetings/pages/motions'; +import { OperatorService } from '@app/site/services/operator.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewMotion, ViewMotionCategory } from 'src/app/site/pages/meetings/pages/motions'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { MotionCategoryControllerService } from '../../../../modules/categories/services'; import { MotionControllerService } from '../../../../services/common/motion-controller.service'; @@ -22,6 +22,7 @@ import { MotionControllerService } from '../../../../services/common/motion-cont selector: `os-category-detail`, templateUrl: `./category-detail.component.html`, styleUrls: [`./category-detail.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CategoryDetailComponent extends BaseMeetingComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-list-sort/category-list-sort.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-list-sort/category-list-sort.component.ts index 4a7779f497..0f86c00204 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-list-sort/category-list-sort.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-list-sort/category-list-sort.component.ts @@ -1,11 +1,11 @@ -import { Component, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ViewChild } from '@angular/core'; +import { CanComponentDeactivate } from '@app/site/guards/watch-for-changes.guard'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewMotionCategory } from '@app/site/pages/meetings/pages/motions'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; +import { SortingTreeComponent } from '@app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { CanComponentDeactivate } from 'src/app/site/guards/watch-for-changes.guard'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewMotionCategory } from 'src/app/site/pages/meetings/pages/motions'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; -import { SortingTreeComponent } from 'src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component'; import { MotionCategoryControllerService } from '../../../../modules/categories/services'; @@ -13,6 +13,7 @@ import { MotionCategoryControllerService } from '../../../../modules/categories/ selector: `os-category-list-sort`, templateUrl: `./category-list-sort.component.html`, styleUrls: [`./category-list-sort.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CategoryListSortComponent extends BaseMeetingComponent implements CanComponentDeactivate { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-list/category-list.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-list/category-list.component.ts index 308770e17e..08cd1126f0 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-list/category-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-list/category-list.component.ts @@ -1,12 +1,12 @@ -import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { Permission } from '@app/domain/definitions/permission'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseMeetingListViewComponent } from '@app/site/pages/meetings/base/base-meeting-list-view.component'; +import { OperatorService } from '@app/site/services/operator.service'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { ViewMotionCategory } from '../../../../modules'; import { MotionCategoryControllerService } from '../../../../modules/categories/services'; @@ -17,6 +17,7 @@ const CATEGORY_LIST_STORAGE_INDEX = `category_list`; selector: `os-category-list`, templateUrl: `./category-list.component.html`, styleUrls: [`./category-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CategoryListComponent extends BaseMeetingListViewComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/comments/comments.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/comments/comments.module.ts index 7fe3479dc4..94b481bb29 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/comments/comments.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/comments/comments.module.ts @@ -9,13 +9,13 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; -import { SortingModule } from 'src/app/ui/modules/sorting'; -import { PipesModule } from 'src/app/ui/pipes'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; +import { SortingModule } from '@app/ui/modules/sorting'; +import { PipesModule } from '@app/ui/pipes'; import { CommentsRoutingModule } from './comments-routing.module'; import { CommentSectionListComponent } from './components/comment-section-list/comment-section-list.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-list/comment-section-list.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-list/comment-section-list.component.ts index 404a4beafb..efd67bef39 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-list/comment-section-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-list/comment-section-list.component.ts @@ -1,17 +1,17 @@ -import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionCommentSection } from '@app/domain/models/motions/motion-comment-section'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseComponent } from '@app/site/base/base.component'; +import { ViewMotionCommentSection } from '@app/site/pages/meetings/pages/motions'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { GroupControllerService } from '@app/site/pages/meetings/pages/participants/modules'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionCommentSection } from 'src/app/domain/models/motions/motion-comment-section'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { ViewMotionCommentSection } from 'src/app/site/pages/meetings/pages/motions'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { GroupControllerService } from 'src/app/site/pages/meetings/pages/participants/modules'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { MotionCommentSectionControllerService } from '../../../../modules/comments/services'; @@ -19,6 +19,7 @@ import { MotionCommentSectionControllerService } from '../../../../modules/comme selector: `os-comment-section-list`, templateUrl: `./comment-section-list.component.html`, styleUrls: [`./comment-section-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CommentSectionListComponent extends BaseComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-sort/comment-section-sort.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-sort/comment-section-sort.component.ts index b1a3ce3790..a42e7c7117 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-sort/comment-section-sort.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-sort/comment-section-sort.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { BaseComponent } from '@app/site/base/base.component'; +import { ViewMotionCommentSection } from '@app/site/pages/meetings/pages/motions'; import { TranslateService } from '@ngx-translate/core'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { ViewMotionCommentSection } from 'src/app/site/pages/meetings/pages/motions'; import { MotionCommentSectionControllerService } from '../../../../modules/comments/services'; @@ -9,6 +9,7 @@ import { MotionCommentSectionControllerService } from '../../../../modules/comme selector: `os-comment-section-sort`, templateUrl: `./comment-section-sort.component.html`, styleUrls: [`./comment-section-sort.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CommentSectionSortComponent extends BaseComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/components/motion-block-create-dialog/motion-block-create-dialog.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/components/motion-block-create-dialog/motion-block-create-dialog.component.ts index e067db9bfd..bacc30c2c8 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/components/motion-block-create-dialog/motion-block-create-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/components/motion-block-create-dialog/motion-block-create-dialog.component.ts @@ -1,12 +1,13 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; -import { MotionBlock } from 'src/app/domain/models/motions/motion-block'; +import { MotionBlock } from '@app/domain/models/motions/motion-block'; @Component({ selector: `os-motion-block-create-dialog`, templateUrl: `./motion-block-create-dialog.component.html`, styleUrls: [`./motion-block-create-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionBlockCreateDialogComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/motion-block-create-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/motion-block-create-dialog.module.ts index 92377461ce..48a6dcae6f 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/motion-block-create-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/motion-block-create-dialog.module.ts @@ -6,8 +6,8 @@ import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { AgendaContentObjectFormModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { AgendaContentObjectFormModule } from '@app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module'; import { MotionBlockCreateDialogComponent } from './components/motion-block-create-dialog/motion-block-create-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/services/motion-block-create-dialog.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/services/motion-block-create-dialog.service.ts index a11b916d5c..92799991da 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/services/motion-block-create-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/services/motion-block-create-dialog.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { MotionBlock } from 'src/app/domain/models/motions/motion-block'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { MotionBlock } from '@app/domain/models/motions/motion-block'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { MotionBlockCreateDialogComponent } from '../components/motion-block-create-dialog/motion-block-create-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-detail/motion-block-detail.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-detail/motion-block-detail.component.ts index e09b02aada..84dfae5e39 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-detail/motion-block-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-detail/motion-block-detail.component.ts @@ -1,16 +1,16 @@ -import { Component, inject, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, OnInit, ViewChild } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; import { ActivatedRoute } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { MotionBlock } from '@app/domain/models/motions/motion-block'; +import { BaseMeetingListViewComponent } from '@app/site/pages/meetings/base/base-meeting-list-view.component'; +import { ViewMotion, ViewMotionBlock } from '@app/site/pages/meetings/pages/motions'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { ColumnRestriction } from '@app/ui/modules/list'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { map, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { MotionBlock } from 'src/app/domain/models/motions/motion-block'; -import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; -import { ViewMotion, ViewMotionBlock } from 'src/app/site/pages/meetings/pages/motions'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { ColumnRestriction } from 'src/app/ui/modules/list'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { AgendaItemControllerService } from '../../../../../agenda/services/agenda-item-controller.service/agenda-item-controller.service'; import { ProjectorControllerService } from '../../../../../projectors/services/projector-controller.service'; @@ -24,6 +24,7 @@ import { MotionBlockEditDialogService } from '../motion-block-edit-dialog/servic selector: `os-motion-block-detail`, templateUrl: `./motion-block-detail.component.html`, styleUrls: [`./motion-block-detail.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionBlockDetailComponent extends BaseMeetingListViewComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/components/motion-block-edit-dialog/motion-block-edit-dialog.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/components/motion-block-edit-dialog/motion-block-edit-dialog.component.ts index 67d668e5cc..be9b390098 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/components/motion-block-edit-dialog/motion-block-edit-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/components/motion-block-edit-dialog/motion-block-edit-dialog.component.ts @@ -1,12 +1,13 @@ -import { Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { MotionBlock } from 'src/app/domain/models/motions/motion-block'; +import { MotionBlock } from '@app/domain/models/motions/motion-block'; @Component({ selector: `os-motion-block-edit-dialog`, templateUrl: `./motion-block-edit-dialog.component.html`, styleUrls: [`./motion-block-edit-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionBlockEditDialogComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/motion-block-edit-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/motion-block-edit-dialog.module.ts index 6a57406fb6..3be33d704d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/motion-block-edit-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/motion-block-edit-dialog.module.ts @@ -6,7 +6,7 @@ import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { MotionBlockEditDialogComponent } from './components/motion-block-edit-dialog/motion-block-edit-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/services/motion-block-edit-dialog.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/services/motion-block-edit-dialog.service.ts index ba45611f94..72dc60e64d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/services/motion-block-edit-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/services/motion-block-edit-dialog.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { MotionBlock } from 'src/app/domain/models/motions/motion-block'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { MotionBlock } from '@app/domain/models/motions/motion-block'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { MotionBlockEditDialogComponent } from '../components/motion-block-edit-dialog/motion-block-edit-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-list/motion-block-list.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-list/motion-block-list.component.ts index 429259d81f..b4943636cf 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-list/motion-block-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-list/motion-block-list.component.ts @@ -1,11 +1,11 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; +import { AgendaItemType } from '@app/domain/models/agenda/agenda-item'; +import { BaseMeetingListViewComponent } from '@app/site/pages/meetings/base/base-meeting-list-view.component'; +import { ViewAgendaItem } from '@app/site/pages/meetings/pages/agenda'; +import { OperatorService } from '@app/site/services/operator.service'; import { TranslateService } from '@ngx-translate/core'; import { Observable, of } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { AgendaItemType } from 'src/app/domain/models/agenda/agenda-item'; -import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; -import { ViewAgendaItem } from 'src/app/site/pages/meetings/pages/agenda'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { AgendaItemControllerService } from '../../../../../agenda/services/agenda-item-controller.service/agenda-item-controller.service'; import { ViewMotionBlock } from '../../../../modules'; @@ -19,6 +19,7 @@ const MOTION_BLOCK_LIST_STORAGE_INDEX = `motion_blocks`; templateUrl: `./motion-block-list.component.html`, styleUrls: [`./motion-block-list.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionBlockListComponent extends BaseMeetingListViewComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/motion-blocks.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/motion-blocks.module.ts index e14a811272..9b456ab13e 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/motion-blocks.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/motion-blocks.module.ts @@ -5,11 +5,11 @@ import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { DirectivesModule } from '@app/ui/directives'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; import { AgendaItemCommonServiceModule } from '../../../agenda/services/agenda-item-common-service.module'; import { MotionBlockCreateDialogModule } from './components/motion-block-create-dialog/motion-block-create-dialog.module'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-detail-filter-list.service/motion-block-detail-filter-list.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-detail-filter-list.service/motion-block-detail-filter-list.service.ts index 45ca661d60..6005b7207b 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-detail-filter-list.service/motion-block-detail-filter-list.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-detail-filter-list.service/motion-block-detail-filter-list.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { ActiveFiltersService } from '@app/site/services/active-filters.service'; import { TranslateService } from '@ngx-translate/core'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { ActiveFiltersService } from 'src/app/site/services/active-filters.service'; import { MotionListFilterService } from '../../../../services/list/motion-list-filter.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-sort.service/motion-block-sort.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-sort.service/motion-block-sort.service.ts index f334d0354a..ba00eadec1 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-sort.service/motion-block-sort.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-sort.service/motion-block-sort.service.ts @@ -1,9 +1,9 @@ import { Injectable, ProviderToken } from '@angular/core'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { MotionBlockRepositoryService } from '@app/gateways/repositories/motions'; +import { BaseSortListService, OsSortingOption } from '@app/site/base/base-sort.service'; +import { ViewMotionBlock } from '@app/site/pages/meetings/pages/motions'; import { _ } from '@ngx-translate/core'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { MotionBlockRepositoryService } from 'src/app/gateways/repositories/motions'; -import { BaseSortListService, OsSortingOption } from 'src/app/site/base/base-sort.service'; -import { ViewMotionBlock } from 'src/app/site/pages/meetings/pages/motions'; @Injectable({ providedIn: `root` diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-call-list/components/motion-call-list/motion-call-list.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-call-list/components/motion-call-list/motion-call-list.component.ts index 12498b784f..1729e3dcb1 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-call-list/components/motion-call-list/motion-call-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-call-list/components/motion-call-list/motion-call-list.component.ts @@ -1,13 +1,13 @@ -import { Component, OnInit } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; -import { BehaviorSubject, Observable } from 'rxjs'; -import { FlatNode } from 'src/app/infrastructure/definitions/tree'; -import { ViewMotion, ViewTag } from 'src/app/site/pages/meetings/pages/motions'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { FlatNode } from '@app/infrastructure/definitions/tree'; +import { ViewMotion, ViewTag } from '@app/site/pages/meetings/pages/motions'; import { BaseSortTreeViewComponent, SortTreeFilterId, SortTreeFilterOption -} from 'src/app/ui/base/base-sort-tree-view-component'; +} from '@app/ui/base/base-sort-tree-view-component'; +import { TranslateService } from '@ngx-translate/core'; +import { BehaviorSubject, Observable } from 'rxjs'; import { MotionCategoryControllerService } from '../../../../modules/categories/services'; import { TagControllerService } from '../../../../modules/tags/services'; @@ -19,6 +19,7 @@ import { MotionPdfExportService } from '../../../../services/export/motion-pdf-e selector: `os-motion-call-list`, templateUrl: `./motion-call-list.component.html`, styleUrls: [`./motion-call-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionCallListComponent extends BaseSortTreeViewComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-call-list/motion-call-list-routing.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-call-list/motion-call-list-routing.module.ts index a59a83a4cb..819306a96c 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-call-list/motion-call-list-routing.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-call-list/motion-call-list-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { WatchForChangesGuard } from 'src/app/site/guards/watch-for-changes.guard'; +import { WatchForChangesGuard } from '@app/site/guards/watch-for-changes.guard'; import { MotionCallListComponent } from './components/motion-call-list/motion-call-list.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-call-list/motion-call-list.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-call-list/motion-call-list.module.ts index 312abd4efa..a08def917f 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-call-list/motion-call-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-call-list/motion-call-list.module.ts @@ -5,9 +5,9 @@ import { MatCardModule } from '@angular/material/card'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { SortingModule } from 'src/app/ui/modules/sorting'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { SortingModule } from '@app/ui/modules/sorting'; import { MotionsExportModule } from '../../services/export/motions-export.module'; import { MotionCallListComponent } from './components/motion-call-list/motion-call-list.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/base/base-motion-detail-child.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/base/base-motion-detail-child.component.ts index e2bf743b91..69d2c20254 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/base/base-motion-detail-child.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/base/base-motion-detail-child.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectorRef, Directive, inject, Input } from '@angular/core'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; import { TranslateService } from '@ngx-translate/core'; import { filter, Observable, Subscription } from 'rxjs'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; import { MotionCategoryControllerService } from '../../../modules/categories/services'; import { MotionChangeRecommendationControllerService } from '../../../modules/change-recommendations/services'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-detail/motion-detail.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-detail/motion-detail.component.ts index 6a9d96f634..50f9c2ae3d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-detail/motion-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-detail/motion-detail.component.ts @@ -1,9 +1,9 @@ -import { Component } from '@angular/core'; -import { Id, Ids } from 'src/app/domain/definitions/key-types'; -import { Motion } from 'src/app/domain/models/motions/motion'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { SequentialNumberMappingService } from 'src/app/site/pages/meetings/services/sequential-number-mapping.service'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Id, Ids } from '@app/domain/definitions/key-types'; +import { Motion } from '@app/domain/models/motions/motion'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { SequentialNumberMappingService } from '@app/site/pages/meetings/services/sequential-number-mapping.service'; import { getMotionAdditionalDetailSubscriptionConfig, @@ -16,6 +16,7 @@ import { MotionControllerService } from '../../../../services/common/motion-cont selector: `os-motion-detail`, templateUrl: `./motion-detail.component.html`, styleUrls: [`./motion-detail.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionDetailComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/directives/listen-editing/listen-editing.directive.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/directives/listen-editing/listen-editing.directive.ts index 4048bab788..a5f7022621 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/directives/listen-editing/listen-editing.directive.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/directives/listen-editing/listen-editing.directive.ts @@ -1,10 +1,10 @@ import { Directive, Input, OnDestroy } from '@angular/core'; +import { Fqid } from '@app/domain/definitions/key-types'; +import { BaseModel } from '@app/domain/models/base/base-model'; +import { NotifyService } from '@app/gateways/notify.service'; +import { BaseComponent } from '@app/site/base/base.component'; +import { OperatorService } from '@app/site/services/operator.service'; import { Subscription } from 'rxjs'; -import { Fqid } from 'src/app/domain/definitions/key-types'; -import { BaseModel } from 'src/app/domain/models/base/base-model'; -import { NotifyService } from 'src/app/gateways/notify.service'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { OperatorService } from 'src/app/site/services/operator.service'; /** * Enum to define different types of notifications. diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/base/base-change-recommendation-dialog.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/base/base-change-recommendation-dialog.component.ts index 2a398f72c6..3934377dfe 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/base/base-change-recommendation-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/base/base-change-recommendation-dialog.component.ts @@ -1,7 +1,7 @@ import { Directive, Inject } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { MotionChangeRecommendation } from 'src/app/domain/models/motions/motion-change-recommendation'; +import { MotionChangeRecommendation } from '@app/domain/models/motions/motion-change-recommendation'; import { MotionChangeRecommendationControllerService } from '../../../../../modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/components/motion-content-change-recommendation-dialog/motion-content-change-recommendation-dialog.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/components/motion-content-change-recommendation-dialog/motion-content-change-recommendation-dialog.component.ts index 167d5594b9..a144254501 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/components/motion-content-change-recommendation-dialog/motion-content-change-recommendation-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/components/motion-content-change-recommendation-dialog/motion-content-change-recommendation-dialog.component.ts @@ -1,9 +1,9 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { AbstractControl, ValidatorFn, Validators } from '@angular/forms'; +import { ModificationType } from '@app/domain/models/motions/motions.constants'; +import { isNumberRange } from '@app/infrastructure/utils/validators'; +import { ParentErrorStateMatcher } from '@app/ui/modules/search-selector/validators'; import { _ } from '@ngx-translate/core'; -import { ModificationType } from 'src/app/domain/models/motions/motions.constants'; -import { isNumberRange } from 'src/app/infrastructure/utils/validators'; -import { ParentErrorStateMatcher } from 'src/app/ui/modules/search-selector/validators'; import { LineRange } from '../../../../../../definitions/index'; import { @@ -42,6 +42,7 @@ export interface MotionContentChangeRecommendationDialogComponentData extends Ba selector: `os-motion-content-change-recommendation-dialog`, templateUrl: `./motion-content-change-recommendation-dialog.component.html`, styleUrls: [`./motion-content-change-recommendation-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionContentChangeRecommendationDialogComponent extends BaseChangeRecommendationDialogComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.ts index 2d60c02c48..7134ae97a5 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ViewEncapsulation } from '@angular/core'; import { Validators } from '@angular/forms'; import { @@ -33,6 +33,7 @@ export interface MotionTitleChangeRecommendationDialogComponentData extends Base templateUrl: `./motion-title-change-recommendation-dialog.component.html`, styleUrls: [`./motion-title-change-recommendation-dialog.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionTitleChangeRecommendationDialogComponent extends BaseChangeRecommendationDialogComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module.ts index 9b5182b481..613468471b 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module.ts @@ -8,8 +8,8 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatRadioModule } from '@angular/material/radio'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { EditorModule } from 'src/app/ui/modules/editor'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { EditorModule } from '@app/ui/modules/editor'; import { MotionContentChangeRecommendationDialogComponent } from './components/motion-content-change-recommendation-dialog/motion-content-change-recommendation-dialog.component'; import { MotionTitleChangeRecommendationDialogComponent } from './components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/services/motion-change-recommendation-dialog.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/services/motion-change-recommendation-dialog.service.ts index 14e2ac9645..aef482f1e8 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/services/motion-change-recommendation-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/services/motion-change-recommendation-dialog.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; -import { infoDialogSettings, mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; +import { infoDialogSettings, mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; import { MotionContentChangeRecommendationDialogComponent, diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts index 44151d038d..7cb08e3423 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts @@ -20,21 +20,21 @@ import { MatTabsModule } from '@angular/material/tabs'; import { MatTimepickerModule } from '@angular/material/timepicker'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { ChipSelectModule } from 'src/app/site/modules/chip-select/chip-select.module'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ActionCardComponent } from 'src/app/ui/modules/action-card'; -import { ChoiceDialogComponent } from 'src/app/ui/modules/choice-dialog'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { DatepickerModule } from 'src/app/ui/modules/datepicker'; -import { EditorModule } from 'src/app/ui/modules/editor'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { OpenSlidesDateAdapterModule } from 'src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.module'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; -import { SortingModule } from 'src/app/ui/modules/sorting'; -import { PipesModule } from 'src/app/ui/pipes/pipes.module'; +import { ChipSelectModule } from '@app/site/modules/chip-select/chip-select.module'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { DirectivesModule } from '@app/ui/directives'; +import { ActionCardComponent } from '@app/ui/modules/action-card'; +import { ChoiceDialogComponent } from '@app/ui/modules/choice-dialog'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { DatepickerModule } from '@app/ui/modules/datepicker'; +import { EditorModule } from '@app/ui/modules/editor'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { OpenSlidesDateAdapterModule } from '@app/ui/modules/openslides-date-adapter/openslides-date-adapter.module'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; +import { SortingModule } from '@app/ui/modules/sorting'; +import { PipesModule } from '@app/ui/pipes/pipes.module'; import { AttachmentControlModule } from '../../../../modules/meetings-component-collector/attachment-control/attachment-control.module'; import { ParticipantSearchSelectorModule } from '../../../../modules/participant-search-selector'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.ts index 48dada0612..579f0a0a60 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.ts @@ -1,15 +1,15 @@ -import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; import { MatStepper } from '@angular/material/stepper'; import { ActivatedRoute } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { OperatorService } from '@app/site/services/operator.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { AmendmentParagraphs } from '../../../../../../../../../../../domain/models/motions/motion'; import { AmendmentControllerService } from '../../../../../../services/common/amendment-controller.service'; @@ -24,6 +24,7 @@ import { templateUrl: `./amendment-create-wizard.component.html`, styleUrls: [`./amendment-create-wizard.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AmendmentCreateWizardComponent extends BaseMeetingComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/motion-form/motion-form.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/motion-form/motion-form.component.ts index fa22edacf2..b6fc9959d8 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/motion-form/motion-form.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/motion-form/motion-form.component.ts @@ -8,6 +8,21 @@ import { } from '@angular/core'; import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; +import { Id, UnsafeHtml } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { HasSequentialNumber, Selectable } from '@app/domain/interfaces'; +import { Mediafile } from '@app/domain/models/mediafiles/mediafile'; +import { Motion } from '@app/domain/models/motions/motion'; +import { GetForwardingCommitteesPresenterService } from '@app/gateways/presenter/get-forwarding-committees-presenter.service'; +import { RawUser, UserRepositoryService } from '@app/gateways/repositories/users'; +import { deepCopy } from '@app/infrastructure/utils/transform-functions'; +import { isUniqueAmong } from '@app/infrastructure/utils/validators/is-unique-among'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; import { auditTime, @@ -21,21 +36,6 @@ import { Subscription, tap } from 'rxjs'; -import { Id, UnsafeHtml } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { HasSequentialNumber, Selectable } from 'src/app/domain/interfaces'; -import { Mediafile } from 'src/app/domain/models/mediafiles/mediafile'; -import { Motion } from 'src/app/domain/models/motions/motion'; -import { GetForwardingCommitteesPresenterService } from 'src/app/gateways/presenter/get-forwarding-committees-presenter.service'; -import { RawUser, UserRepositoryService } from 'src/app/gateways/repositories/users'; -import { deepCopy } from 'src/app/infrastructure/utils/transform-functions'; -import { isUniqueAmong } from 'src/app/infrastructure/utils/validators/is-unique-among'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { ParticipantListSortService } from '../../../../../../../participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service'; import { getParticipantMinimalSubscriptionConfig } from '../../../../../../../participants/participants.subscription'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/motion-form-routing.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/motion-form-routing.module.ts index 375d2a4f36..965db9a2e3 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/motion-form-routing.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/motion-form-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Permission } from 'src/app/domain/definitions/permission'; +import { Permission } from '@app/domain/definitions/permission'; import { AmendmentCreateWizardComponent } from './components/amendment-create-wizard/amendment-create-wizard.component'; import { MotionFormComponent } from './components/motion-form/motion-form.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/motion-form.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/motion-form.module.ts index 95074ce244..5a4915f223 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/motion-form.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/motion-form.module.ts @@ -9,15 +9,15 @@ import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatRadioModule } from '@angular/material/radio'; import { MatStepperModule } from '@angular/material/stepper'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { AgendaContentObjectFormModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module'; -import { AttachmentControlModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control'; -import { DetailViewModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/detail-view.module'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { EditorModule } from 'src/app/ui/modules/editor'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; -import { PipesModule } from 'src/app/ui/pipes'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { AgendaContentObjectFormModule } from '@app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/agenda-content-object-form.module'; +import { AttachmentControlModule } from '@app/site/pages/meetings/modules/meetings-component-collector/attachment-control'; +import { DetailViewModule } from '@app/site/pages/meetings/modules/meetings-component-collector/detail-view/detail-view.module'; +import { DirectivesModule } from '@app/ui/directives'; +import { EditorModule } from '@app/ui/modules/editor'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; +import { PipesModule } from '@app/ui/pipes'; import { MotionDetailDirectivesModule } from '../../modules/directives/motion-detail-directives.module'; import { AmendmentCreateWizardComponent } from './components/amendment-create-wizard/amendment-create-wizard.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/base/base-motion-detail-action-card.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/base/base-motion-detail-action-card.component.ts index ab2fc8fbfe..f888c50443 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/base/base-motion-detail-action-card.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/base/base-motion-detail-action-card.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectorRef, Directive, inject, Input } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; +import { BaseComponent } from '@app/site/base/base.component'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; import { TranslateService } from '@ngx-translate/core'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; /** * A wrapper component for components in the motion detail view which uses an ``. diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-add-poll-button/motion-add-poll-button.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-add-poll-button/motion-add-poll-button.component.ts index 472ddf502e..2e5b730bd3 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-add-poll-button/motion-add-poll-button.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-add-poll-button/motion-add-poll-button.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; +import { PollDialogData } from '@app/site/pages/meetings/modules/poll/definitions'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; import { map, Observable } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { PollDialogData } from 'src/app/site/pages/meetings/modules/poll/definitions'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; import { MotionPollService } from '../../../../../../modules/motion-poll/services/motion-poll.service/motion-poll.service'; import { MotionPollDialogService } from '../../../../../../modules/motion-poll/services/motion-poll-dialog.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-comment/motion-comment.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-comment/motion-comment.component.ts index 072c46635f..752982b177 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-comment/motion-comment.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-comment/motion-comment.component.ts @@ -1,9 +1,9 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { Identifiable } from '@app/domain/interfaces'; +import { MotionComment } from '@app/domain/models/motions/motion-comment'; +import { ViewMotionComment, ViewMotionCommentSection } from '@app/site/pages/meetings/pages/motions'; +import { OperatorService } from '@app/site/services/operator.service'; import { TranslateService } from '@ngx-translate/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MotionComment } from 'src/app/domain/models/motions/motion-comment'; -import { ViewMotionComment, ViewMotionCommentSection } from 'src/app/site/pages/meetings/pages/motions'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { MotionCommentControllerService } from '../../../../../../modules/comments/services/motion-comment-controller.service'; import { MotionPdfExportService } from '../../../../../../services/export/motion-pdf-export.service/motion-pdf-export.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-comments/motion-comments.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-comments/motion-comments.component.ts index deaf361d26..905bcd3f4b 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-comments/motion-comments.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-comments/motion-comments.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { ViewMotion, ViewMotionComment, ViewMotionCommentSection } from '@app/site/pages/meetings/pages/motions'; +import { OperatorService } from '@app/site/services/operator.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { Observable } from 'rxjs'; -import { ViewMotion, ViewMotionComment, ViewMotionCommentSection } from 'src/app/site/pages/meetings/pages/motions'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { MotionCommentSectionControllerService } from '../../../../../../modules/comments/services/motion-comment-section-controller.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.ts index 063cc759d4..1e1d6daaf2 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; +import { ChangeRecoMode, LineNumberingMode } from '@app/domain/models/motions/motions.constants'; +import { ViewMeetingMediafile } from '@app/site/pages/meetings/pages/mediafiles'; +import { LineRange } from '@app/site/pages/meetings/pages/motions/definitions'; +import { ViewUnifiedChange } from '@app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, combineLatest, map, Observable, startWith } from 'rxjs'; -import { ChangeRecoMode, LineNumberingMode } from 'src/app/domain/models/motions/motions.constants'; -import { ViewMeetingMediafile } from 'src/app/site/pages/meetings/pages/mediafiles'; -import { LineRange } from 'src/app/site/pages/meetings/pages/motions/definitions'; -import { ViewUnifiedChange } from 'src/app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change'; import { MotionPermissionService } from '../../../../../../services/common/motion-permission.service/motion-permission.service'; import { ViewMotion } from '../../../../../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-delete-dialog/motion-delete-dialog.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-delete-dialog/motion-delete-dialog.component.ts index 2dad58766d..827ef3d698 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-delete-dialog/motion-delete-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-delete-dialog/motion-delete-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { TranslatePipe } from '@ngx-translate/core'; @@ -13,6 +13,7 @@ interface MotionDeleteDialogData { selector: `os-motion-delete-dialog`, templateUrl: `./motion-delete-dialog.component.html`, styleUrls: [`./motion-delete-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, imports: [MatDialogModule, MatButtonModule, TranslatePipe] }) export class MotionDeleteDialogComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff-summary/motion-detail-diff-summary.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff-summary/motion-detail-diff-summary.component.ts index 9c8ba1c003..dd562731e9 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff-summary/motion-detail-diff-summary.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff-summary/motion-detail-diff-summary.component.ts @@ -1,8 +1,8 @@ import { AfterViewInit, ChangeDetectionStrategy, Component, inject, Input, ViewEncapsulation } from '@angular/core'; import { FormControl } from '@angular/forms'; import { TooltipPosition } from '@angular/material/tooltip'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewUnifiedChange } from 'src/app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewUnifiedChange } from '@app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change'; import { getRecommendationTypeName } from '../../../../../../definitions/recommendation-type-names'; import { ViewUnifiedChangeType } from '../../../../../../modules/change-recommendations/definitions/index'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff/motion-detail-diff.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff/motion-detail-diff.component.ts index 2d91e928ac..484b207f15 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff/motion-detail-diff.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-diff/motion-detail-diff.component.ts @@ -13,15 +13,15 @@ import { import { FormControl } from '@angular/forms'; import { MatMenuTrigger } from '@angular/material/menu'; import { TooltipPosition } from '@angular/material/tooltip'; +import { Id } from '@app/domain/definitions/key-types'; +import { LineNumberingMode } from '@app/domain/models/motions/motions.constants'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { LineRange } from '@app/site/pages/meetings/pages/motions/definitions'; +import { ViewUnifiedChange } from '@app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change'; +import { HEAD_BAR_HEIGHT } from '@app/ui/modules/head-bar/components/head-bar/head-bar.component'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { LineNumberingMode } from 'src/app/domain/models/motions/motions.constants'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { LineRange } from 'src/app/site/pages/meetings/pages/motions/definitions'; -import { ViewUnifiedChange } from 'src/app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change'; -import { HEAD_BAR_HEIGHT } from 'src/app/ui/modules/head-bar/components/head-bar/head-bar.component'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { getRecommendationTypeName } from '../../../../../../definitions/recommendation-type-names'; import { ViewUnifiedChangeType } from '../../../../../../modules/change-recommendations/definitions/index'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts index a1203b6464..1675416375 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts @@ -9,15 +9,15 @@ import { Output, Renderer2 } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; +import { ModificationType } from '@app/domain/models/motions/motions.constants'; +import { MotionRepositoryService } from '@app/gateways/repositories/motions'; +import { LineRange } from '@app/site/pages/meetings/pages/motions/definitions'; +import { ViewUnifiedChange } from '@app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { AutoupdateCommunicationService } from '@app/site/services/autoupdate/autoupdate-communication.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { filter, firstValueFrom } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { ModificationType } from 'src/app/domain/models/motions/motions.constants'; -import { MotionRepositoryService } from 'src/app/gateways/repositories/motions'; -import { LineRange } from 'src/app/site/pages/meetings/pages/motions/definitions'; -import { ViewUnifiedChange } from 'src/app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { AutoupdateCommunicationService } from 'src/app/site/services/autoupdate/autoupdate-communication.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { MOTION_DETAIL_SUBSCRIPTION } from '../../../../../../motions.subscription'; import { MotionControllerService } from '../../../../../../services/common/motion-controller.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-extension-field/motion-extension-field.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-extension-field/motion-extension-field.component.ts index 0b976aac9d..7b1ee3b686 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-extension-field/motion-extension-field.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-extension-field/motion-extension-field.component.ts @@ -10,8 +10,8 @@ import { } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { NavigationEnd, Router } from '@angular/router'; +import { Selectable } from '@app/domain/interfaces/selectable'; import { distinctUntilChanged, Observable, Subscription } from 'rxjs'; -import { Selectable } from 'src/app/domain/interfaces/selectable'; export interface SearchListDefinition { observable: Observable; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-final-version/motion-final-version.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-final-version/motion-final-version.component.ts index bffd970d20..b9ef0ea31f 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-final-version/motion-final-version.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-final-version/motion-final-version.component.ts @@ -1,9 +1,9 @@ import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { UnsafeHtml } from '@app/domain/definitions/key-types'; +import { LineNumberingMode } from '@app/domain/models/motions/motions.constants'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { UnsafeHtml } from 'src/app/domain/definitions/key-types'; -import { LineNumberingMode } from 'src/app/domain/models/motions/motions.constants'; import { BaseMotionDetailChildComponent } from '../../../../base/base-motion-detail-child.component'; import { ModifiedFinalVersionAction } from '../../../../services/motion-detail-view.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-highlight-form/motion-highlight-form.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-highlight-form/motion-highlight-form.component.ts index f0a0f88337..a04c8b6c5b 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-highlight-form/motion-highlight-form.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-highlight-form/motion-highlight-form.component.ts @@ -2,12 +2,12 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output import { UntypedFormControl } from '@angular/forms'; import { ErrorStateMatcher } from '@angular/material/core'; import { MatMenuTrigger } from '@angular/material/menu'; +import { ChangeRecoMode, LineNumberingMode } from '@app/domain/models/motions/motions.constants'; +import { ViewMotionChangeRecommendation } from '@app/site/pages/meetings/pages/motions'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; import { filter, firstValueFrom } from 'rxjs'; -import { ChangeRecoMode, LineNumberingMode } from 'src/app/domain/models/motions/motions.constants'; -import { ViewMotionChangeRecommendation } from 'src/app/site/pages/meetings/pages/motions'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { verboseChangeRecoMode } from '../../../../../../../../../../../domain/models/motions/motions.constants'; import { ViewUnifiedChange } from '../../../../../../modules/change-recommendations/view-models/view-unified-change'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-motion-meeting-users/motion-manage-motion-meeting-users.component.spec.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-motion-meeting-users/motion-manage-motion-meeting-users.component.spec.ts index f2dcd72d9d..c22c095f3c 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-motion-meeting-users/motion-manage-motion-meeting-users.component.spec.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-motion-meeting-users/motion-manage-motion-meeting-users.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { BaseModel } from 'src/app/domain/models/base/base-model'; -import { BaseHasMeetingUserViewModel } from 'src/app/site/pages/meetings/base/base-has-meeting-user-view-model'; +import { BaseModel } from '@app/domain/models/base/base-model'; +import { BaseHasMeetingUserViewModel } from '@app/site/pages/meetings/base/base-has-meeting-user-view-model'; import { MotionManageMotionMeetingUsersComponent } from './motion-manage-motion-meeting-users.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-motion-meeting-users/motion-manage-motion-meeting-users.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-motion-meeting-users/motion-manage-motion-meeting-users.component.ts index 604ab9a61c..15bea8cdd0 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-motion-meeting-users/motion-manage-motion-meeting-users.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-motion-meeting-users/motion-manage-motion-meeting-users.component.ts @@ -1,18 +1,18 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormControl } from '@angular/forms'; +import { Fqid, Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Selectable } from '@app/domain/interfaces/selectable'; +import { BaseModel } from '@app/domain/models/base/base-model'; +import { Action, ActionService } from '@app/gateways/actions'; +import { KeyOfType } from '@app/infrastructure/utils/keyof-type'; +import { BaseHasMeetingUserViewModel } from '@app/site/pages/meetings/base/base-has-meeting-user-view-model'; +import { UserSelectionData } from '@app/site/pages/meetings/modules/participant-search-selector'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { BehaviorSubject, filter, firstValueFrom, map, Observable } from 'rxjs'; -import { Fqid, Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Selectable } from 'src/app/domain/interfaces/selectable'; -import { BaseModel } from 'src/app/domain/models/base/base-model'; -import { Action, ActionService } from 'src/app/gateways/actions'; -import { KeyOfType } from 'src/app/infrastructure/utils/keyof-type'; -import { BaseHasMeetingUserViewModel } from 'src/app/site/pages/meetings/base/base-has-meeting-user-view-model'; -import { UserSelectionData } from 'src/app/site/pages/meetings/modules/participant-search-selector'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { BaseMotionMeetingUserControllerService } from '../../../../../../modules/util'; import { MotionControllerService } from '../../../../../../services/common/motion-controller.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-polls/motion-manage-polls.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-polls/motion-manage-polls.component.ts index 951616c464..c35354a75d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-polls/motion-manage-polls.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-polls/motion-manage-polls.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; import { ViewPoll } from '../../../../../../../polls'; import { MotionPollDialogService } from '../../../../../../modules/motion-poll/services/motion-poll-dialog.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-supporters/motion-manage-supporters.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-supporters/motion-manage-supporters.component.ts index 89a28ec753..d10e0b8581 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-supporters/motion-manage-supporters.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-supporters/motion-manage-supporters.component.ts @@ -3,26 +3,26 @@ import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@a import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { BehaviorSubject, Observable } from 'rxjs'; -import { Fqid, Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { Identifiable, Selectable } from 'src/app/domain/interfaces'; -import { Action, ActionService } from 'src/app/gateways/actions'; -import { getIntlCollatorForLang } from 'src/app/infrastructure/utils'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { Fqid, Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { Identifiable, Selectable } from '@app/domain/interfaces'; +import { Action, ActionService } from '@app/gateways/actions'; +import { getIntlCollatorForLang } from '@app/infrastructure/utils'; +import { BaseComponent } from '@app/site/base/base.component'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { ParticipantSearchSelectorModule, UserSelectionData -} from 'src/app/site/pages/meetings/modules/participant-search-selector'; -import { ParticipantListSortService } from 'src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { SortingListModule } from 'src/app/ui/modules/sorting/modules'; +} from '@app/site/pages/meetings/modules/participant-search-selector'; +import { ParticipantListSortService } from '@app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OperatorService } from '@app/site/services/operator.service'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { SortingListModule } from '@app/ui/modules/sorting/modules'; +import { BehaviorSubject, Observable } from 'rxjs'; import { ViewMotionSupporter } from '../../../../../../modules/supporters'; import { MotionSupporterControllerService } from '../../../../../../modules/supporters/services'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.ts index 1d9b229b87..06530fe90b 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-timestamp/motion-manage-timestamp.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; +import { Permission } from '@app/domain/definitions/permission'; +import { KeyOfType } from '@app/infrastructure/utils/keyof-type'; +import { OperatorService } from '@app/site/services/operator.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { fromUnixTime, isDate } from 'date-fns'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { KeyOfType } from 'src/app/infrastructure/utils/keyof-type'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { MotionControllerService } from '../../../../../../services/common/motion-controller.service'; import { ViewMotion } from '../../../../../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-title/motion-manage-title.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-title/motion-manage-title.component.html index 52f2e0560e..dc6c1087f2 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-title/motion-manage-title.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-title/motion-manage-title.component.html @@ -50,7 +50,10 @@ {{ 'Amendment to' | translate }}   - + {{ parent.number || parent.title }} diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-title/motion-manage-title.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-title/motion-manage-title.component.ts index 1d9af0c78a..77625a9d6b 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-title/motion-manage-title.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-manage-title/motion-manage-title.component.ts @@ -1,9 +1,9 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; +import { ChangeRecoMode } from '@app/domain/models/motions/motions.constants'; +import { ProjectableTitleComponent } from '@app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/projectable-title/projectable-title.component'; +import { ViewMotionChangeRecommendation } from '@app/site/pages/meetings/pages/motions'; import { TranslateService } from '@ngx-translate/core'; import { map, Observable, Subscription } from 'rxjs'; -import { ChangeRecoMode } from 'src/app/domain/models/motions/motions.constants'; -import { ProjectableTitleComponent } from 'src/app/site/pages/meetings/modules/meetings-component-collector/detail-view/components/projectable-title/projectable-title.component'; -import { ViewMotionChangeRecommendation } from 'src/app/site/pages/meetings/pages/motions'; import { PersonalNoteControllerService } from '../../../../../../modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service'; import { BaseMotionDetailChildComponent } from '../../../../base/base-motion-detail-child.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-meta-data/motion-meta-data.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-meta-data/motion-meta-data.component.html index 642cd8a674..29fd1a8952 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-meta-data/motion-meta-data.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-meta-data/motion-meta-data.component.html @@ -8,7 +8,7 @@ field="submitters" secondSelectorLabel="{{ 'Committees' | translate }}" title="{{ 'Submitters' | translate }}" - [additionalInputValue]="motion?.additional_submitter" + [additionalInputValue]="$safeNavigationMigration(motion?.additional_submitter)" [loadSecondSelectorValues]="loadForwardingCommittees" [motion]="motion" [repo]="motionSubmitterRepo" @@ -52,7 +52,7 @@ [chipValue]="stateLabel" [classes]="motion.stateCssColor" [hasExtension]="!!motionState && motionState.show_state_extension_field" - [searchFieldInput]="motion?.state_extension" + [searchFieldInput]="$safeNavigationMigration(motion?.state_extension)" (succeeded)="setStateExtension($event)" > @@ -144,9 +144,9 @@

{{ 'Motion forwarded to' | translate }}

[canBeEdited]="perms.isAllowed('change_metadata', motion)" [chipValue]="recommendationLabel" [hasExtension]="!!motion.recommendation && motion.recommendation.show_recommendation_extension_field" - [internal]="motion?.state?.is_internal" + [internal]="$safeNavigationMigration(motion?.state?.is_internal)" [listValueTransformFns]="[motionTransformFn]" - [searchFieldInput]="motion?.recommendation_extension" + [searchFieldInput]="$safeNavigationMigration(motion?.recommendation_extension)" [searchLists]="searchLists" (succeeded)="setRecommendationExtension($event)" > @@ -211,7 +211,7 @@

{{ 'Referring motions' | translate }}

@if (motion?.identical_motions?.length) {

{{ 'Identical with' | translate }}

- + {{ view.numberOrTitle }} diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-meta-data/motion-meta-data.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-meta-data/motion-meta-data.component.ts index 8ca8eeadca..cced50039a 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-meta-data/motion-meta-data.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-meta-data/motion-meta-data.component.ts @@ -1,18 +1,18 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { Selectable } from '@app/domain/interfaces'; +import { Settings } from '@app/domain/models/meetings/meeting'; +import { Motion } from '@app/domain/models/motions'; +import { MotionBlock } from '@app/domain/models/motions/motion-block'; +import { ChangeRecoMode } from '@app/domain/models/motions/motions.constants'; +import { GetForwardingCommitteesPresenterService } from '@app/gateways/presenter/get-forwarding-committees-presenter.service'; +import { ViewMotion, ViewMotionCategory, ViewMotionState, ViewTag } from '@app/site/pages/meetings/pages/motions'; +import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { OperatorService } from '@app/site/services/operator.service'; import { TranslateService } from '@ngx-translate/core'; import { map, Observable, Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { Selectable } from 'src/app/domain/interfaces'; -import { Settings } from 'src/app/domain/models/meetings/meeting'; -import { Motion } from 'src/app/domain/models/motions'; -import { MotionBlock } from 'src/app/domain/models/motions/motion-block'; -import { ChangeRecoMode } from 'src/app/domain/models/motions/motions.constants'; -import { GetForwardingCommitteesPresenterService } from 'src/app/gateways/presenter/get-forwarding-committees-presenter.service'; -import { ViewMotion, ViewMotionCategory, ViewMotionState, ViewTag } from 'src/app/site/pages/meetings/pages/motions'; -import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { MotionForwardDialogService } from '../../../../../../components/motion-forward-dialog/services/motion-forward-dialog.service'; import { MotionEditorControllerService } from '../../../../../../modules/editors/services'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-personal-note/motion-personal-note.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-personal-note/motion-personal-note.component.ts index c5fc96e095..a9c720215c 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-personal-note/motion-personal-note.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-personal-note/motion-personal-note.component.ts @@ -1,8 +1,8 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { PersonalNote } from '@app/domain/models/motions/personal-note'; +import { ViewPersonalNote } from '@app/site/pages/meetings/pages/motions'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, map, Observable } from 'rxjs'; -import { PersonalNote } from 'src/app/domain/models/motions/personal-note'; -import { ViewPersonalNote } from 'src/app/site/pages/meetings/pages/motions'; import { PersonalNoteControllerService } from '../../../../../../modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service'; import { MotionPdfExportService } from '../../../../../../services/export/motion-pdf-export.service/motion-pdf-export.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.html index 7339121bd9..f4ed0fd7a3 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.html @@ -3,7 +3,7 @@ @let isMobile = vp.isMobileSubject | async; @if (originMotionsLoaded.length) { - +
@for (originMotion of originMotionsLoaded; track originMotion.id) { - +
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts index 95bfd06034..acc7aea22b 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts @@ -10,6 +10,17 @@ import { } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, RoutesRecognized } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { ChangeRecoMode, LineNumberingMode, PERSONAL_NOTE_ID } from '@app/domain/models/motions/motions.constants'; +import { MeetingRepositoryService } from '@app/gateways/repositories/meeting-repository.service'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewMotion, ViewMotionChangeRecommendation, ViewUnifiedChange } from '@app/site/pages/meetings/pages/motions'; +import { AutoupdateService } from '@app/site/services/autoupdate'; +import { ModelRequestBuilderService } from '@app/site/services/model-request-builder'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; import { auditTime, @@ -24,21 +35,6 @@ import { Subscription, switchMap } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { ChangeRecoMode, LineNumberingMode, PERSONAL_NOTE_ID } from 'src/app/domain/models/motions/motions.constants'; -import { MeetingRepositoryService } from 'src/app/gateways/repositories/meeting-repository.service'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { - ViewMotion, - ViewMotionChangeRecommendation, - ViewUnifiedChange -} from 'src/app/site/pages/meetings/pages/motions'; -import { AutoupdateService } from 'src/app/site/services/autoupdate'; -import { ModelRequestBuilderService } from 'src/app/site/services/model-request-builder'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { AgendaItemControllerService } from '../../../../../../../agenda/services/agenda-item-controller.service/agenda-item-controller.service'; import { MotionForwardDialogService } from '../../../../../../components/motion-forward-dialog/services/motion-forward-dialog.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/origin-motion-meta-data/origin-motion-meta-data.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/origin-motion-meta-data/origin-motion-meta-data.component.html index 1e0eb371cc..dc773a8e38 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/origin-motion-meta-data/origin-motion-meta-data.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/origin-motion-meta-data/origin-motion-meta-data.component.html @@ -61,11 +61,11 @@

[canBeEdited]="false" [chipValue]="recommendationLabel" [hasExtension]="!!motion.recommendation && motion.recommendation.show_recommendation_extension_field" - [internal]="motion?.state?.is_internal" + [internal]="$safeNavigationMigration(motion?.state?.is_internal)" [listValueTransformFns]="[motionTransformFn]" - [searchFieldInput]="motion?.recommendation_extension" + [searchFieldInput]="$safeNavigationMigration(motion?.recommendation_extension)" [searchLists]="searchLists" - [title]="motion.meeting?.motions_recommendations_by" + [title]="$safeNavigationMigration(motion.meeting?.motions_recommendations_by)" (succeeded)="setRecommendationExtension($event)" > diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/origin-motion-meta-data/origin-motion-meta-data.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/origin-motion-meta-data/origin-motion-meta-data.component.ts index 0168699b75..e92d5a94c8 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/origin-motion-meta-data/origin-motion-meta-data.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/origin-motion-meta-data/origin-motion-meta-data.component.ts @@ -1,14 +1,14 @@ import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Selectable } from '@app/domain/interfaces'; +import { Motion } from '@app/domain/models/motions'; +import { MotionBlock } from '@app/domain/models/motions/motion-block'; +import { ChangeRecoMode } from '@app/domain/models/motions/motions.constants'; +import { ViewMotion, ViewMotionCategory, ViewTag } from '@app/site/pages/meetings/pages/motions'; +import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, map, Observable } from 'rxjs'; -import { Selectable } from 'src/app/domain/interfaces'; -import { Motion } from 'src/app/domain/models/motions'; -import { MotionBlock } from 'src/app/domain/models/motions/motion-block'; -import { ChangeRecoMode } from 'src/app/domain/models/motions/motions.constants'; -import { ViewMotion, ViewMotionCategory, ViewTag } from 'src/app/site/pages/meetings/pages/motions'; -import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; import { ParticipantListSortService } from '../../../../../../../participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service'; import { MotionForwardDialogService } from '../../../../../../components/motion-forward-dialog/services/motion-forward-dialog.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/paragraph-based-amendment/paragraph-based-amendment.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/paragraph-based-amendment/paragraph-based-amendment.component.ts index c4c1c5dd69..a67f023593 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/paragraph-based-amendment/paragraph-based-amendment.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/paragraph-based-amendment/paragraph-based-amendment.component.ts @@ -1,9 +1,9 @@ import { ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, Output } from '@angular/core'; +import { UnsafeHtml } from '@app/domain/definitions/key-types'; +import { ChangeRecoMode, LineNumberingMode } from '@app/domain/models/motions/motions.constants'; +import { LineRange } from '@app/site/pages/meetings/pages/motions/definitions'; +import { ViewUnifiedChange } from '@app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change'; import { TranslateService } from '@ngx-translate/core'; -import { UnsafeHtml } from 'src/app/domain/definitions/key-types'; -import { ChangeRecoMode, LineNumberingMode } from 'src/app/domain/models/motions/motions.constants'; -import { LineRange } from 'src/app/site/pages/meetings/pages/motions/definitions'; -import { ViewUnifiedChange } from 'src/app/site/pages/meetings/pages/motions/modules/change-recommendations/view-models/view-unified-change'; import { DiffLinesInParagraph } from '../../../../../../definitions/index'; import { BaseMotionDetailChildComponent } from '../../../../base/base-motion-detail-child.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/motion-view.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/motion-view.module.ts index 455b3e8eac..f853c25453 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/motion-view.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/motion-view.module.ts @@ -1,6 +1,6 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { MotionManageSupportersComponent } from './components/motion-manage-supporters/motion-manage-supporters.component'; import { MotionViewRoutingModule } from './motion-view-routing.module'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-export/components/motion-export/motion-export.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-export/components/motion-export/motion-export.component.ts index 54330fc962..3b51083f0c 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-export/components/motion-export/motion-export.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-export/components/motion-export/motion-export.component.ts @@ -1,5 +1,13 @@ import { CommonModule } from '@angular/common'; -import { AfterViewInit, Component, inject, OnDestroy, ViewChild, ViewEncapsulation } from '@angular/core'; +import { + AfterViewInit, + ChangeDetectionStrategy, + Component, + inject, + OnDestroy, + ViewChild, + ViewEncapsulation +} from '@angular/core'; import { ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { MatBadgeModule } from '@angular/material/badge'; import { MatButtonModule } from '@angular/material/button'; @@ -9,19 +17,19 @@ import { MatChipOption, MatChipsModule } from '@angular/material/chips'; import { MatIconModule } from '@angular/material/icon'; import { MatTabChangeEvent, MatTabGroup, MatTabsModule } from '@angular/material/tabs'; import { ActivatedRoute } from '@angular/router'; +import { Settings } from '@app/domain/models/meetings/meeting'; +import { ChangeRecoMode, LineNumberingMode, PERSONAL_NOTE_ID } from '@app/domain/models/motions/motions.constants'; +import { MotionRepositoryService } from '@app/gateways/repositories/motions'; +import { StorageService } from '@app/gateways/storage.service'; +import { BaseComponent } from '@app/site/base/base.component'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { ViewMotion, ViewMotionCommentSection } from '@app/site/pages/meetings/pages/motions'; +import { MeetingComponentServiceCollectorService } from '@app/site/pages/meetings/services/meeting-component-service-collector.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { DirectivesModule } from '@app/ui/directives'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; import { TranslateService } from '@ngx-translate/core'; import { Observable, pairwise, Subscription } from 'rxjs'; -import { Settings } from 'src/app/domain/models/meetings/meeting'; -import { ChangeRecoMode, LineNumberingMode, PERSONAL_NOTE_ID } from 'src/app/domain/models/motions/motions.constants'; -import { MotionRepositoryService } from 'src/app/gateways/repositories/motions'; -import { StorageService } from 'src/app/gateways/storage.service'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { ViewMotion, ViewMotionCommentSection } from 'src/app/site/pages/meetings/pages/motions'; -import { MeetingComponentServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-component-service-collector.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; import { MotionCommentSectionControllerService } from '../../../../modules/comments/services/motion-comment-section-controller.service'; import { getMotionDetailSubscriptionConfig } from '../../../../motions.subscription'; @@ -46,6 +54,7 @@ interface SavedSelections { templateUrl: `./motion-export.component.html`, styleUrls: [`./motion-export.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, imports: [ CommonModule, ReactiveFormsModule, diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.ts index f84d934602..9624597d94 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/components/motion-list/motion-list.component.ts @@ -1,11 +1,11 @@ -import { Component, inject, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { OsFilterOptionCondition } from '@app/site/base/base-filter.service'; +import { BaseMeetingListViewComponent } from '@app/site/pages/meetings/base/base-meeting-list-view.component'; +import { ViewMotionCategory, ViewMotionState } from '@app/site/pages/meetings/pages/motions'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { GridBlockTileType } from '@app/ui/modules/grid'; import { firstValueFrom, map } from 'rxjs'; -import { OsFilterOptionCondition } from 'src/app/site/base/base-filter.service'; -import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; -import { ViewMotionCategory, ViewMotionState } from 'src/app/site/pages/meetings/pages/motions'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { GridBlockTileType } from 'src/app/ui/modules/grid'; import { MotionForwardDialogService } from '../../../../components/motion-forward-dialog/services/motion-forward-dialog.service'; import { MotionMultiselectService } from '../../../../components/motion-multiselect/services/motion-multiselect.service'; @@ -41,6 +41,7 @@ interface TileCategoryInformation { selector: `os-motion-list`, templateUrl: `./motion-list.component.html`, styleUrls: [`./motion-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionListComponent extends BaseMeetingListViewComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/components/motion-list-info-dialog/motion-list-info-dialog.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/components/motion-list-info-dialog/motion-list-info-dialog.component.ts index fc4cc34200..15009d9851 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/components/motion-list-info-dialog/motion-list-info-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/components/motion-list-info-dialog/motion-list-info-dialog.component.ts @@ -1,14 +1,9 @@ -import { Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { deepCopy } from '@app/infrastructure/utils/transform-functions'; +import { ViewMotionBlock, ViewMotionCategory, ViewMotionState, ViewTag } from '@app/site/pages/meetings/pages/motions'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; import { Observable } from 'rxjs'; -import { deepCopy } from 'src/app/infrastructure/utils/transform-functions'; -import { - ViewMotionBlock, - ViewMotionCategory, - ViewMotionState, - ViewTag -} from 'src/app/site/pages/meetings/pages/motions'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; import { MotionCategoryControllerService } from '../../../../../../modules/categories/services/motion-category-controller.service'; import { MotionBlockControllerService } from '../../../../../../modules/motion-blocks/services/motion-block-controller.service'; @@ -21,6 +16,7 @@ import { MotionListInfoDialogConfig } from '../../definitions'; selector: `os-motion-list-info-dialog`, templateUrl: `./motion-list-info-dialog.component.html`, styleUrls: [`./motion-list-info-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionListInfoDialogComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/definitions.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/definitions.ts index 1e06dc4e6d..13ed370cbf 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/definitions.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/definitions.ts @@ -1,4 +1,4 @@ -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; /** * Interface to describe possible values and changes for diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/motion-list-info-dialog.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/motion-list-info-dialog.module.ts index 834e9d1ecf..3da0f1588c 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/motion-list-info-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/motion-list-info-dialog.module.ts @@ -5,8 +5,8 @@ import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatSelectModule } from '@angular/material/select'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; import { MotionListInfoDialogComponent } from './components/motion-list-info-dialog/motion-list-info-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/services/motion-list-info-dialog.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/services/motion-list-info-dialog.service.ts index 585af410ff..d2cba22e9e 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/services/motion-list-info-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/services/motion-list-info-dialog.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { Identifiable } from '@app/domain/interfaces'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { MotionListInfoDialogComponent } from '../components/motion-list-info-dialog/motion-list-info-dialog.component'; import { MotionListInfoDialogConfig } from '../definitions'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/motion-list.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/motion-list.module.ts index b4af1a3dbb..746f53cf87 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/motion-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/motion-list.module.ts @@ -8,14 +8,14 @@ import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { GridModule } from 'src/app/ui/modules/grid'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { PipesModule } from 'src/app/ui/pipes/pipes.module'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { DirectivesModule } from '@app/ui/directives'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { GridModule } from '@app/ui/modules/grid'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { PipesModule } from '@app/ui/pipes/pipes.module'; import { MotionForwardDialogModule } from '../../components/motion-forward-dialog/motion-forward-dialog.module'; import { MotionMultiselectModule } from '../../components/motion-multiselect/motion-multiselect.module'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.ts index 91bccc45b4..0feaab2e8e 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-detail/motion-poll-detail.component.ts @@ -1,11 +1,11 @@ import { ChangeDetectionStrategy, Component, ViewEncapsulation } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; -import { Permission } from 'src/app/domain/definitions/permission'; +import { Permission } from '@app/domain/definitions/permission'; import { BasePollDetailComponent, BaseVoteData -} from 'src/app/site/pages/meetings/modules/poll/base/base-poll-detail.component'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; +} from '@app/site/pages/meetings/modules/poll/base/base-poll-detail.component'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { TranslateService } from '@ngx-translate/core'; import { MotionPollService } from '../../../../modules/motion-poll/services'; import { MotionPollDialogService } from '../../../../modules/motion-poll/services/motion-poll-dialog.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-main/motion-poll-main.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-main/motion-poll-main.component.ts index 0a85a2ebeb..e6e46c4d5a 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-main/motion-poll-main.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/components/motion-poll-main/motion-poll-main.component.ts @@ -1,6 +1,6 @@ -import { Component } from '@angular/core'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; -import { SequentialNumberMappingService } from 'src/app/site/pages/meetings/services/sequential-number-mapping.service'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; +import { SequentialNumberMappingService } from '@app/site/pages/meetings/services/sequential-number-mapping.service'; import { getParticipantMinimalSubscriptionConfig } from '../../../../../participants/participants.subscription'; import { ViewPoll } from '../../../../../polls'; @@ -10,6 +10,7 @@ import { getPollDetailSubscriptionConfig } from '../../../../../polls/polls.subs selector: `os-motion-poll-main`, templateUrl: `./motion-poll-main.component.html`, styleUrls: [`./motion-poll-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MotionPollMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/motion-polls.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/motion-polls.module.ts index a3192bf56c..55829d686c 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/motion-polls.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/motion-polls.module.ts @@ -6,11 +6,11 @@ import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTabsModule } from '@angular/material/tabs'; import { RouterModule } from '@angular/router'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { ListModule } from 'src/app/ui/modules/list'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { DirectivesModule } from '@app/ui/directives'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { ListModule } from '@app/ui/modules/list'; import { ParticipantCommonServiceModule } from '../../../participants/services/common/participant-common-service.module'; import { MotionPollModule } from '../../modules/motion-poll'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.ts index d22ce8b34c..da30e3b812 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.ts @@ -1,11 +1,11 @@ -import { ChangeDetectorRef, Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseMeetingListViewComponent } from '@app/site/pages/meetings/base/base-meeting-list-view.component'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; import { map, Observable } from 'rxjs'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { InteractionService } from '../../../../../interaction/services/interaction.service'; import { ViewTag } from '../../../../modules'; @@ -15,6 +15,7 @@ import { TagControllerService } from '../../../../modules/tags/services'; selector: `os-tag-list`, templateUrl: `./tag-list.component.html`, styleUrls: [`./tag-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class TagListComponent extends BaseMeetingListViewComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/tags/tags.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/tags/tags.module.ts index 6411bc1341..c88de563e9 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/tags/tags.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/tags/tags.module.ts @@ -6,9 +6,9 @@ import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { ListModule } from 'src/app/ui/modules/list'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { ListModule } from '@app/ui/modules/list'; import { TagListComponent } from './components/tag-list/tag-list.component'; import { TagsRoutingModule } from './tags-routing.module'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail-sort/workflow-detail-sort.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail-sort/workflow-detail-sort.component.ts index a30ef5eabc..ea1888a673 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail-sort/workflow-detail-sort.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail-sort/workflow-detail-sort.component.ts @@ -1,12 +1,12 @@ -import { Component, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ViewChild } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { MotionState } from '@app/domain/models/motions/motion-state'; +import { Action } from '@app/gateways/actions'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; +import { SortingListComponent } from '@app/ui/modules/sorting/modules/sorting-list/components/sorting-list/sorting-list.component'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, map, Observable, Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { MotionState } from 'src/app/domain/models/motions/motion-state'; -import { Action } from 'src/app/gateways/actions'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; -import { SortingListComponent } from 'src/app/ui/modules/sorting/modules/sorting-list/components/sorting-list/sorting-list.component'; import { ViewMotionState, ViewMotionWorkflow } from '../../../../modules'; import { MotionStateControllerService } from '../../../../modules/states/services'; @@ -17,6 +17,7 @@ import { getMotionWorkflowDetailSubscriptionConfig } from '../../../../motions.s selector: `os-workflow-detail-sort`, templateUrl: `./workflow-detail-sort.component.html`, styleUrls: [`./workflow-detail-sort.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class WorkflowDetailSortComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail/workflow-detail.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail/workflow-detail.component.ts index 81b4234664..90e7999f82 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail/workflow-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail/workflow-detail.component.ts @@ -1,16 +1,16 @@ -import { ChangeDetectorRef, Component, TemplateRef, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, TemplateRef, ViewChild } from '@angular/core'; import { MatCheckboxChange } from '@angular/material/checkbox'; import { MatDialog } from '@angular/material/dialog'; import { MatTableDataSource } from '@angular/material/table'; +import { Id } from '@app/domain/definitions/key-types'; +import { MergeAmendment, MotionState, Restriction } from '@app/domain/models/motions/motion-state'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewMotionState, ViewMotionWorkflow } from '@app/site/pages/meetings/pages/motions'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { MergeAmendment, MotionState, Restriction } from 'src/app/domain/models/motions/motion-state'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewMotionState, ViewMotionWorkflow } from 'src/app/site/pages/meetings/pages/motions'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { MotionStateControllerService } from '../../../../modules/states/services'; import { MotionWorkflowControllerService } from '../../../../modules/workflows/services'; @@ -69,6 +69,7 @@ interface RestrictionShape { selector: `os-workflow-detail`, templateUrl: `./workflow-detail.component.html`, styleUrls: [`./workflow-detail.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class WorkflowDetailComponent extends BaseMeetingComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-import/workflow-import.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-import/workflow-import.component.html index 05225ba4f2..ecba48913d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-import/workflow-import.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-import/workflow-import.component.html @@ -9,7 +9,7 @@

Import workflows

{{ 'Title' | translate }}
- {{ row?.title | translate }} + {{ $safeNavigationMigration(row?.title) | translate }}
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-import/workflow-import.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-import/workflow-import.component.ts index e6b6066d1a..4e21ec01ff 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-import/workflow-import.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-import/workflow-import.component.ts @@ -1,7 +1,7 @@ import { Location } from '@angular/common'; -import { Component } from '@angular/core'; -import { UploadFileJsonProcessorService } from 'src/app/infrastructure/utils/import/json-import-file-utils'; -import { FileData } from 'src/app/ui/modules/file-upload/components/file-upload/file-upload.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { UploadFileJsonProcessorService } from '@app/infrastructure/utils/import/json-import-file-utils'; +import { FileData } from '@app/ui/modules/file-upload/components/file-upload/file-upload.component'; import { MotionWorkflowControllerService } from '../../../../modules/workflows/services'; @@ -9,6 +9,7 @@ import { MotionWorkflowControllerService } from '../../../../modules/workflows/s selector: `os-workflow-import`, templateUrl: `./workflow-import.component.html`, styleUrls: [`./workflow-import.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class WorkflowImportComponent { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-list/workflow-list.component.ts b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-list/workflow-list.component.ts index ae94168237..ae50626e09 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-list/workflow-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/components/workflow-list/workflow-list.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit, TemplateRef } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, TemplateRef } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseMeetingListViewComponent } from '@app/site/pages/meetings/base/base-meeting-list-view.component'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { ViewMotionWorkflow } from '../../../../modules'; import { MotionWorkflowControllerService } from '../../../../modules/workflows/services'; @@ -15,6 +15,7 @@ const WORKFLOW_LIST_STORAGE_INDEX = `workflows`; selector: `os-workflow-list`, templateUrl: `./workflow-list.component.html`, styleUrls: [`./workflow-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class WorkflowListComponent extends BaseMeetingListViewComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/services/workflow-export.service/workflow-export.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/services/workflow-export.service/workflow-export.service.ts index 129dfde760..ababc9d325 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/services/workflow-export.service/workflow-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/services/workflow-export.service/workflow-export.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; +import { MotionState } from '@app/domain/models/motions/motion-state'; +import { MotionWorkflow } from '@app/domain/models/motions/motion-workflow'; +import { ViewMotionWorkflow } from '@app/site/pages/meetings/pages/motions'; import { TranslateService } from '@ngx-translate/core'; import { saveAs } from 'file-saver'; -import { MotionState } from 'src/app/domain/models/motions/motion-state'; -import { MotionWorkflow } from 'src/app/domain/models/motions/motion-workflow'; -import { ViewMotionWorkflow } from 'src/app/site/pages/meetings/pages/motions'; import { MotionStateControllerService } from '../../../../modules/states/services'; diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/workflows.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/workflows.module.ts index 369b56d693..53401c5611 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/workflows.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/workflows.module.ts @@ -13,12 +13,12 @@ import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; import { MatTableModule } from '@angular/material/table'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { FileUploadModule } from 'src/app/ui/modules/file-upload'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { SortingListModule } from 'src/app/ui/modules/sorting/modules'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { FileUploadModule } from '@app/ui/modules/file-upload'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { SortingListModule } from '@app/ui/modules/sorting/modules'; import { WorkflowDetailComponent } from './components/workflow-detail/workflow-detail.component'; import { WorkflowDetailSortComponent } from './components/workflow-detail-sort/workflow-detail-sort.component'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.ts index ef9828d11a..43315beafb 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Motion } from '@app/domain/models/motions/motion'; +import { CreateResponse } from '@app/gateways/repositories/base-repository'; +import { MotionRepositoryService } from '@app/gateways/repositories/motions'; +import { viewModelListEqual } from '@app/infrastructure/utils'; import { distinctUntilChanged, map, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Motion } from 'src/app/domain/models/motions/motion'; -import { CreateResponse } from 'src/app/gateways/repositories/base-repository'; -import { MotionRepositoryService } from 'src/app/gateways/repositories/motions'; -import { viewModelListEqual } from 'src/app/infrastructure/utils'; import { ViewMotion } from '../../../view-models'; import { MotionControllerService } from '../motion-controller.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-controller.service/motion-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-controller.service/motion-controller.service.ts index ac7ebdab78..83f9f8c4db 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-controller.service/motion-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-controller.service/motion-controller.service.ts @@ -1,18 +1,18 @@ import { Injectable } from '@angular/core'; +import { Id, Ids } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Motion } from '@app/domain/models/motions/motion'; +import { ChangeRecoMode } from '@app/domain/models/motions/motions.constants'; +import { Action, createEmptyAction } from '@app/gateways/actions'; +import { CreateResponse } from '@app/gateways/repositories/base-repository'; +import { MotionRepositoryService } from '@app/gateways/repositories/motions'; +import { UserRepositoryService } from '@app/gateways/repositories/users'; +import { TreeIdNode } from '@app/infrastructure/definitions/tree'; +import { NullablePartial } from '@app/infrastructure/utils'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { map, Observable } from 'rxjs'; -import { Id, Ids } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Motion } from 'src/app/domain/models/motions/motion'; -import { ChangeRecoMode } from 'src/app/domain/models/motions/motions.constants'; -import { Action, createEmptyAction } from 'src/app/gateways/actions'; -import { CreateResponse } from 'src/app/gateways/repositories/base-repository'; -import { MotionRepositoryService } from 'src/app/gateways/repositories/motions'; -import { UserRepositoryService } from 'src/app/gateways/repositories/users'; -import { TreeIdNode } from 'src/app/infrastructure/definitions/tree'; -import { NullablePartial } from 'src/app/infrastructure/utils'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { DiffLinesInParagraph } from '../../../definitions'; import { LineNumberingService, MotionDiffService } from '../../../modules/change-recommendations/services'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-format.service/motion-format.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-format.service/motion-format.service.ts index 4f7dada401..8a41c8caaf 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-format.service/motion-format.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-format.service/motion-format.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { MotionFormattingRepresentation } from '@app/domain/models/motions/motion'; +import { ChangeRecoMode, LineNumberingMode } from '@app/domain/models/motions/motions.constants'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; import { TranslateService } from '@ngx-translate/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { MotionFormattingRepresentation } from 'src/app/domain/models/motions/motion'; -import { ChangeRecoMode, LineNumberingMode } from 'src/app/domain/models/motions/motions.constants'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; import { ViewUnifiedChange, ViewUnifiedChangeType } from '../../../modules'; import { diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-line-numbering.service/motion-line-numbering.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-line-numbering.service/motion-line-numbering.service.ts index 69c274b63d..89345d79eb 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-line-numbering.service/motion-line-numbering.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-line-numbering.service/motion-line-numbering.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; +import { ChangeRecoMode } from '@app/domain/models/motions/motions.constants'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { ChangeRecoMode } from 'src/app/domain/models/motions/motions.constants'; import { DiffLinesInParagraph } from '../../../definitions'; import { ViewMotionChangeRecommendation, ViewUnifiedChange } from '../../../modules'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts index cc6d2c7004..296c8e4668 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; +import { Permission } from '@app/domain/definitions/permission'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { ViewMotion } from '../../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/amendment-list-pdf.service/amendment-list-pdf.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/amendment-list-pdf.service/amendment-list-pdf.service.ts index f0e3840e68..4e18b2d3bc 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/amendment-list-pdf.service/amendment-list-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/amendment-list-pdf.service/amendment-list-pdf.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; +import { HtmlToPdfService } from '@app/gateways/export/html-to-pdf.service'; import { TranslateService } from '@ngx-translate/core'; import { Content, ContentTable, TableCell } from 'pdfmake/interfaces'; -import { HtmlToPdfService } from 'src/app/gateways/export/html-to-pdf.service'; import { ViewMotion } from '../../../view-models'; import { MotionControllerService } from '../../common/motion-controller.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/definitions.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/definitions.ts index a682a294b1..4b79b71651 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/definitions.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/definitions.ts @@ -1,4 +1,4 @@ -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; /** * Type declaring which strings are valid options for metainfos to be exported into a pdf */ diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.ts index d88e43b725..3c06d3c703 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; +import { ChangeRecoMode, PERSONAL_NOTE_ID } from '@app/domain/models/motions/motions.constants'; +import { CsvColumnDefinitionMap, CsvColumnDefinitionProperty } from '@app/gateways/export/csv-export.service'; +import { reconvertChars, stripHtmlTags } from '@app/infrastructure/utils'; +import { MeetingCsvExportService } from '@app/site/pages/meetings/services/export'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; import { TranslateService } from '@ngx-translate/core'; -import { ChangeRecoMode, PERSONAL_NOTE_ID } from 'src/app/domain/models/motions/motions.constants'; -import { CsvColumnDefinitionMap, CsvColumnDefinitionProperty } from 'src/app/gateways/export/csv-export.service'; -import { reconvertChars, stripHtmlTags } from 'src/app/infrastructure/utils'; -import { MeetingCsvExportService } from 'src/app/site/pages/meetings/services/export'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; import { MotionCommentSectionControllerService } from '../../../modules/comments/services'; import { ViewMotion } from '../../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-export.service/motion-export.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-export.service/motion-export.service.ts index a492ee8684..3fff34e179 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-export.service/motion-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-export.service/motion-export.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { ChangeRecoMode, LineNumberingMode } from 'src/app/domain/models/motions/motions.constants'; -import { PdfError } from 'src/app/gateways/export/pdf-document.service'; +import { ChangeRecoMode, LineNumberingMode } from '@app/domain/models/motions/motions.constants'; +import { PdfError } from '@app/gateways/export/pdf-document.service'; import { ViewMotion } from '../../../view-models'; import { ExportFileFormat, InfoToExport } from '../definitions'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-html-to-pdf.service/motion-html-to-pdf.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-html-to-pdf.service/motion-html-to-pdf.service.ts index 18aa2c251e..6523eda858 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-html-to-pdf.service/motion-html-to-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-html-to-pdf.service/motion-html-to-pdf.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; -import { Content, ContentColumns } from 'pdfmake/interfaces'; -import { LineNumberingMode } from 'src/app/domain/models/motions/motions.constants'; +import { LineNumberingMode } from '@app/domain/models/motions/motions.constants'; import { ChildNodeParagraphPayload, CreateSpecificParagraphPayload, HtmlToPdfService -} from 'src/app/gateways/export/html-to-pdf.service'; +} from '@app/gateways/export/html-to-pdf.service'; +import { Content, ContentColumns } from 'pdfmake/interfaces'; /** * Shape of line number objects diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-catalog.service/motion-pdf-catalog.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-catalog.service/motion-pdf-catalog.service.ts index c56ec3ed8c..fc7aecbeab 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-catalog.service/motion-pdf-catalog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-catalog.service/motion-pdf-catalog.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; +import { MOTION_PDF_OPTIONS } from '@app/domain/models/motions/motions.constants'; +import { BorderType, PdfError, StyleType } from '@app/gateways/export/pdf-document.service'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { MeetingPdfExportService } from '@app/site/pages/meetings/services/export'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; import { TranslateService } from '@ngx-translate/core'; import { Content } from 'pdfmake/interfaces'; -import { MOTION_PDF_OPTIONS } from 'src/app/domain/models/motions/motions.constants'; -import { BorderType, PdfError, StyleType } from 'src/app/gateways/export/pdf-document.service'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { MeetingPdfExportService } from 'src/app/site/pages/meetings/services/export'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; import { MotionCategoryControllerService } from '../../../modules/categories/services'; import { MotionControllerService } from '../../common/motion-controller.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-export.service/motion-pdf-export.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-export.service/motion-pdf-export.service.ts index 2d58169448..8b751cd878 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-export.service/motion-pdf-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-export.service/motion-pdf-export.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; +import { ProgressSnackBarService } from '@app/gateways/export/progress-snack-bar/services/progress-snack-bar.service'; +import { ProgressSnackBarControlService } from '@app/gateways/export/progress-snack-bar/services/progress-snack-bar-control.service'; +import { ViewMotionCommentSection } from '@app/site/pages/meetings/pages/motions'; +import { MeetingPdfExportService } from '@app/site/pages/meetings/services/export'; import { PDFDocument } from '@cantoo/pdf-lib'; import { TranslateService } from '@ngx-translate/core'; import { saveAs } from 'file-saver'; -import { ProgressSnackBarService } from 'src/app/gateways/export/progress-snack-bar/services/progress-snack-bar.service'; -import { ProgressSnackBarControlService } from 'src/app/gateways/export/progress-snack-bar/services/progress-snack-bar-control.service'; -import { ViewMotionCommentSection } from 'src/app/site/pages/meetings/pages/motions'; -import { MeetingPdfExportService } from 'src/app/site/pages/meetings/services/export'; import { ViewMotion } from '../../../view-models'; import { AmendmentListPdfService } from '../amendment-list-pdf.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf.service/motion-pdf.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf.service/motion-pdf.service.ts index 025c731611..5720ee80d3 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf.service/motion-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf.service/motion-pdf.service.ts @@ -1,19 +1,19 @@ import { Location } from '@angular/common'; import { Injectable } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; -import { Content, ContentTable, ContentText, TableCell } from 'pdfmake/interfaces'; import { ChangeRecoMode, LineNumberingMode, MOTION_PDF_OPTIONS, PERSONAL_NOTE_ID -} from 'src/app/domain/models/motions/motions.constants'; -import { VOTE_UNDOCUMENTED } from 'src/app/domain/models/poll'; -import { PdfImagesService } from 'src/app/gateways/export/pdf-document.service/pdf-images.service'; -import { ViewMotion, ViewMotionChangeRecommendation } from 'src/app/site/pages/meetings/pages/motions'; -import { MeetingPdfExportService } from 'src/app/site/pages/meetings/services/export'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; +} from '@app/domain/models/motions/motions.constants'; +import { VOTE_UNDOCUMENTED } from '@app/domain/models/poll'; +import { PdfImagesService } from '@app/gateways/export/pdf-document.service/pdf-images.service'; +import { ViewMotion, ViewMotionChangeRecommendation } from '@app/site/pages/meetings/pages/motions'; +import { MeetingPdfExportService } from '@app/site/pages/meetings/services/export'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { TranslateService } from '@ngx-translate/core'; +import { Content, ContentTable, ContentText, TableCell } from 'pdfmake/interfaces'; import { getRecommendationTypeName } from '../../../definitions'; import { ViewUnifiedChangeType } from '../../../modules'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-xlsx-export.service/motion-xlsx-export.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-xlsx-export.service/motion-xlsx-export.service.ts index 2945db3e20..ac161c3f01 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-xlsx-export.service/motion-xlsx-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-xlsx-export.service/motion-xlsx-export.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; +import { Ids } from '@app/domain/definitions/key-types'; +import { PERSONAL_NOTE_ID } from '@app/domain/models/motions/motions.constants'; +import { CellFillingDefinition, XlsxExportService } from '@app/gateways/export/xlsx-export.service'; +import { reconvertChars, stripHtmlTags } from '@app/infrastructure/utils'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { Workbook } from 'exceljs'; -import { Ids } from 'src/app/domain/definitions/key-types'; -import { PERSONAL_NOTE_ID } from 'src/app/domain/models/motions/motions.constants'; -import { CellFillingDefinition, XlsxExportService } from 'src/app/gateways/export/xlsx-export.service'; -import { reconvertChars, stripHtmlTags } from 'src/app/infrastructure/utils'; import { MotionCommentSectionControllerService } from '../../../modules/comments/services'; import { ViewMotionWorkingGroupSpeaker } from '../../../modules/working-group-speakers'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motions-export.module.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motions-export.module.ts index 4ce4feb30b..314c5bf284 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motions-export.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motions-export.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; -import { MotionPollModule } from 'src/app/site/pages/meetings/pages/motions/modules/motion-poll'; -import { MeetingExportModule } from 'src/app/site/pages/meetings/services/export'; +import { MotionPollModule } from '@app/site/pages/meetings/pages/motions/modules/motion-poll'; +import { MeetingExportModule } from '@app/site/pages/meetings/services/export'; @NgModule({ imports: [MotionPollModule, MeetingExportModule] diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-filter.service/amendment-list-filter.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-filter.service/amendment-list-filter.service.ts index 03fba4a63f..089b72dcc8 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-filter.service/amendment-list-filter.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-filter.service/amendment-list-filter.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; +import { OsFilter } from '@app/site/base/base-filter.service'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; +import { ActiveFiltersService } from '@app/site/services/active-filters.service'; import { TranslateService } from '@ngx-translate/core'; -import { OsFilter } from 'src/app/site/base/base-filter.service'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; -import { ActiveFiltersService } from 'src/app/site/services/active-filters.service'; import { MotionControllerService } from '../../common/motion-controller.service'; import { MotionListFilterService } from '../motion-list-filter.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-sort.service/amendment-list-sort.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-sort.service/amendment-list-sort.service.ts index 80979cbed1..d4222a010a 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-sort.service/amendment-list-sort.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-sort.service/amendment-list-sort.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { OsSortingOption } from 'src/app/site/base/base-sort.service'; -import { ViewMotion } from 'src/app/site/pages/meetings/pages/motions'; +import { OsSortingOption } from '@app/site/base/base-sort.service'; +import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; import { MotionListBaseSortService } from '../motion-list-base-sort.service'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-base-sort.service/motion-list-base-sort.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-base-sort.service/motion-list-base-sort.service.ts index 65cb203cfa..1d626bd1ff 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-base-sort.service/motion-list-base-sort.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-base-sort.service/motion-list-base-sort.service.ts @@ -1,15 +1,15 @@ import { Directive, inject, ProviderToken } from '@angular/core'; -import { _ } from '@ngx-translate/core'; -import { BehaviorSubject, Observable } from 'rxjs'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { MotionRepositoryService } from 'src/app/gateways/repositories/motions'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { MotionRepositoryService } from '@app/gateways/repositories/motions'; import { BaseSortListService, OsSortingDefinition, OsSortingOption, OsSortProperty -} from 'src/app/site/base/base-sort.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; +} from '@app/site/base/base-sort.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { _ } from '@ngx-translate/core'; +import { BehaviorSubject, Observable } from 'rxjs'; import { ViewMotion } from '../../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-filter.service/motion-list-filter.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-filter.service/motion-list-filter.service.ts index fa06fb0559..2a44e196db 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-filter.service/motion-list-filter.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-filter.service/motion-list-filter.service.ts @@ -1,19 +1,14 @@ import { inject, Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { Restriction } from '@app/domain/models/motions/motion-state'; +import { AmendmentType } from '@app/domain/models/motions/motions.constants'; +import { BaseFilterListService, OsFilter, OsFilterOption, OsFilterOptions } from '@app/site/base/base-filter.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ActiveFiltersService } from '@app/site/services/active-filters.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { Restriction } from 'src/app/domain/models/motions/motion-state'; -import { AmendmentType } from 'src/app/domain/models/motions/motions.constants'; -import { - BaseFilterListService, - OsFilter, - OsFilterOption, - OsFilterOptions -} from 'src/app/site/base/base-filter.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ActiveFiltersService } from 'src/app/site/services/active-filters.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { MotionCategoryControllerService } from '../../../modules/categories/services'; import { MotionCommentSectionControllerService } from '../../../modules/comments/services'; diff --git a/client/src/app/site/pages/meetings/pages/motions/view-models/view-motion-amended-paragraph.ts b/client/src/app/site/pages/meetings/pages/motions/view-models/view-motion-amended-paragraph.ts index de283c9f09..4d9ed5bc01 100644 --- a/client/src/app/site/pages/meetings/pages/motions/view-models/view-motion-amended-paragraph.ts +++ b/client/src/app/site/pages/meetings/pages/motions/view-models/view-motion-amended-paragraph.ts @@ -1,5 +1,5 @@ -import { MergeAmendment } from 'src/app/domain/models/motions/motion-state'; -import { ModificationType } from 'src/app/domain/models/motions/motions.constants'; +import { MergeAmendment } from '@app/domain/models/motions/motion-state'; +import { ModificationType } from '@app/domain/models/motions/motions.constants'; import { LineRange } from '../definitions'; import { ViewUnifiedChange, ViewUnifiedChangeType } from '../modules'; diff --git a/client/src/app/site/pages/meetings/pages/motions/view-models/view-motion.ts b/client/src/app/site/pages/meetings/pages/motions/view-models/view-motion.ts index b1fed452fe..391de87d1a 100644 --- a/client/src/app/site/pages/meetings/pages/motions/view-models/view-motion.ts +++ b/client/src/app/site/pages/meetings/pages/motions/view-models/view-motion.ts @@ -1,7 +1,7 @@ +import { HasHistoryEntries } from '@app/gateways/repositories/history-entry/has-history-entries'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models/projection-build-descriptor'; import { _ } from '@ngx-translate/core'; -import { HasHistoryEntries } from 'src/app/gateways/repositories/history-entry/has-history-entries'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models/projection-build-descriptor'; import { Id } from '../../../../../../domain/definitions/key-types'; import { AgendaItemType } from '../../../../../../domain/models/agenda/agenda-item'; diff --git a/client/src/app/site/pages/meetings/pages/participants/components/participant-main/participant-main.component.ts b/client/src/app/site/pages/meetings/pages/participants/components/participant-main/participant-main.component.ts index 5951669c79..f6e422dfe1 100644 --- a/client/src/app/site/pages/meetings/pages/participants/components/participant-main/participant-main.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/components/participant-main/participant-main.component.ts @@ -1,7 +1,7 @@ -import { Component } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfig } from 'src/app/domain/interfaces/subscription-config'; -import { BaseMeetingModelRequestHandler } from 'src/app/site/pages/meetings/base/base-meeting-model-request-handler.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfig } from '@app/domain/interfaces/subscription-config'; +import { BaseMeetingModelRequestHandler } from '@app/site/pages/meetings/base/base-meeting-model-request-handler.component'; import { getParticipantListSubscriptionConfig, @@ -13,6 +13,7 @@ import { getStructureLevelListSubscriptionConfig } from '../../participants.subs selector: `os-participant-main`, templateUrl: `./participant-main.component.html`, styleUrls: [`./participant-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ParticipantMainComponent extends BaseMeetingModelRequestHandler { diff --git a/client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.ts b/client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.ts index 688b01fa5e..2d6a0f4f68 100644 --- a/client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; -import { UserExport } from 'src/app/domain/models/users/user.export'; +import { UserExport } from '@app/domain/models/users/user.export'; import { CsvColumnDefinitionMap, CsvColumnDefinitionProperty, CsvColumnsDefinition -} from 'src/app/gateways/export/csv-export.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; +} from '@app/gateways/export/csv-export.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { TranslateService } from '@ngx-translate/core'; import { MeetingCsvExportForBackendService } from '../../../../services/export/meeting-csv-export-for-backend.service'; import { participantColumns } from '../../pages/participant-import/definitions'; diff --git a/client/src/app/site/pages/meetings/pages/participants/export/participant-export.module.ts b/client/src/app/site/pages/meetings/pages/participants/export/participant-export.module.ts index efd28a8cb2..dff085c252 100644 --- a/client/src/app/site/pages/meetings/pages/participants/export/participant-export.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/export/participant-export.module.ts @@ -1,6 +1,6 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { MeetingExportModule } from 'src/app/site/pages/meetings/services/export'; +import { MeetingExportModule } from '@app/site/pages/meetings/services/export'; @NgModule({ declarations: [], diff --git a/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf-export.service/participant-pdf-export.service.ts b/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf-export.service/participant-pdf-export.service.ts index 7445869d58..7d926ce5be 100644 --- a/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf-export.service/participant-pdf-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf-export.service/participant-pdf-export.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; +import { MeetingPdfExportService } from '@app/site/pages/meetings/services/export/meeting-pdf-export.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { TranslateService } from '@ngx-translate/core'; import { Content } from 'pdfmake/interfaces'; -import { MeetingPdfExportService } from 'src/app/site/pages/meetings/services/export/meeting-pdf-export.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; import { ParticipantPdfService } from '../participant-pdf.service'; diff --git a/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf.service/participant-pdf.service.ts b/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf.service/participant-pdf.service.ts index 5879e62ae7..69459df0f5 100644 --- a/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf.service/participant-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf.service/participant-pdf.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; import { TranslateService } from '@ngx-translate/core'; import { Column, Content, ContentColumns, ContentTable, TableCell } from 'pdfmake/interfaces'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; /** * Creates a pdf for a user, containing greetings and initial login information diff --git a/client/src/app/site/pages/meetings/pages/participants/export/speaker-csv-export.service/speaker-csv-export.service.ts b/client/src/app/site/pages/meetings/pages/participants/export/speaker-csv-export.service/speaker-csv-export.service.ts index e23394434a..49e716d37e 100644 --- a/client/src/app/site/pages/meetings/pages/participants/export/speaker-csv-export.service/speaker-csv-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/export/speaker-csv-export.service/speaker-csv-export.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; -import { _ } from '@ngx-translate/core'; -import { TranslateService } from '@ngx-translate/core'; -import { format, fromUnixTime } from 'date-fns'; -import { DateFnsConfigurationService } from 'ngx-date-fns'; import { CsvColumnDefinitionMap, CsvColumnDefinitionProperty, CsvColumnsDefinition -} from 'src/app/gateways/export/csv-export.service'; -import { DurationService } from 'src/app/site/services/duration.service'; +} from '@app/gateways/export/csv-export.service'; +import { DurationService } from '@app/site/services/duration.service'; +import { _ } from '@ngx-translate/core'; +import { TranslateService } from '@ngx-translate/core'; +import { format, fromUnixTime } from 'date-fns'; +import { DateFnsConfigurationService } from 'ngx-date-fns'; import { MeetingCsvExportForBackendService } from '../../../../services/export/meeting-csv-export-for-backend.service'; import { ViewSpeaker } from '../../../agenda'; diff --git a/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.html b/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.html index 32de826e8d..d4e9f890c8 100644 --- a/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.html +++ b/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.html @@ -123,7 +123,7 @@

mat-button type="submit" [disabled]="!groupForm?.valid" - (click)="saveGroup(groupForm?.value)" + (click)="saveGroup($safeNavigationMigration(groupForm?.value))" > {{ 'Save' | translate }} diff --git a/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.ts b/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.ts index b046d7d030..2308fd2be8 100644 --- a/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/modules/groups/components/group-list/group-list.component.ts @@ -1,18 +1,18 @@ -import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { MatTableDataSource } from '@angular/material/table'; +import { Permission } from '@app/domain/definitions/permission'; +import { AppPermission, DisplayPermission, PERMISSIONS } from '@app/domain/definitions/permission.config'; +import { permissionChildren, permissionParents } from '@app/domain/definitions/permission-relations'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { isUniqueAmong } from '@app/infrastructure/utils/validators/is-unique-among'; +import { CanComponentDeactivate } from '@app/site/guards/watch-for-changes.guard'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { OperatorService } from '@app/site/services/operator.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { AppPermission, DisplayPermission, PERMISSIONS } from 'src/app/domain/definitions/permission.config'; -import { permissionChildren, permissionParents } from 'src/app/domain/definitions/permission-relations'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { isUniqueAmong } from 'src/app/infrastructure/utils/validators/is-unique-among'; -import { CanComponentDeactivate } from 'src/app/site/guards/watch-for-changes.guard'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { GroupControllerService } from '../../services'; @@ -20,6 +20,7 @@ import { GroupControllerService } from '../../services'; selector: `os-group-list`, templateUrl: `./group-list.component.html`, styleUrls: [`./group-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class GroupListComponent extends BaseMeetingComponent implements OnInit, CanComponentDeactivate { diff --git a/client/src/app/site/pages/meetings/pages/participants/modules/groups/groups-routing.module.ts b/client/src/app/site/pages/meetings/pages/participants/modules/groups/groups-routing.module.ts index 74ee85d30c..61fd194599 100644 --- a/client/src/app/site/pages/meetings/pages/participants/modules/groups/groups-routing.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/modules/groups/groups-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { WatchForChangesGuard } from 'src/app/site/guards/watch-for-changes.guard'; +import { WatchForChangesGuard } from '@app/site/guards/watch-for-changes.guard'; import { GroupListComponent } from './components/group-list/group-list.component'; diff --git a/client/src/app/site/pages/meetings/pages/participants/modules/groups/groups.module.ts b/client/src/app/site/pages/meetings/pages/participants/modules/groups/groups.module.ts index 1c213ade16..ebf2ce009c 100644 --- a/client/src/app/site/pages/meetings/pages/participants/modules/groups/groups.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/modules/groups/groups.module.ts @@ -9,8 +9,8 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatTableModule } from '@angular/material/table'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; import { GroupListComponent } from './components/group-list/group-list.component'; import { GroupsRoutingModule } from './groups-routing.module'; diff --git a/client/src/app/site/pages/meetings/pages/participants/modules/groups/services/group-controller.service.ts b/client/src/app/site/pages/meetings/pages/participants/modules/groups/services/group-controller.service.ts index 9552f9a202..0a1ea529de 100644 --- a/client/src/app/site/pages/meetings/pages/participants/modules/groups/services/group-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/modules/groups/services/group-controller.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Group } from '@app/domain/models/users/group'; +import { GroupRepositoryService } from '@app/gateways/repositories/groups'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { map, Observable, OperatorFunction } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Group } from 'src/app/domain/models/users/group'; -import { GroupRepositoryService } from 'src/app/gateways/repositories/groups'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { ViewGroup } from '../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/participants/modules/groups/view-models/view-group.ts b/client/src/app/site/pages/meetings/pages/participants/modules/groups/view-models/view-group.ts index 507df013fb..b4fb051a18 100644 --- a/client/src/app/site/pages/meetings/pages/participants/modules/groups/view-models/view-group.ts +++ b/client/src/app/site/pages/meetings/pages/participants/modules/groups/view-models/view-group.ts @@ -1,5 +1,5 @@ -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { BaseHasMeetingUsersViewModel } from 'src/app/site/pages/meetings/base/base-has-meeting-user-view-model'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; +import { BaseHasMeetingUsersViewModel } from '@app/site/pages/meetings/base/base-has-meeting-user-view-model'; import { Permission } from '../../../../../../../../domain/definitions/permission'; import { permissionChildren } from '../../../../../../../../domain/definitions/permission-relations'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/components/mandate-check-list/mandate-check-list.component.html b/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/components/mandate-check-list/mandate-check-list.component.html index 45294102be..e2b1cfb49b 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/components/mandate-check-list/mandate-check-list.component.html +++ b/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/components/mandate-check-list/mandate-check-list.component.html @@ -84,15 +84,21 @@

{{ entry.genderEntryMap.get(gender.id)?.present }} {{ displayPercent( - entry.genderEntryMap.get(gender.id)?.present / - entry.presentUserIds.length + $safeNavigationMigration( + entry.genderEntryMap.get(gender.id)?.present + ) / entry.presentUserIds.length ) }}

}
-
{{ entry.genderEntryMap.get(gender.id)?.label | translate }}
+
+ {{ + $safeNavigationMigration(entry.genderEntryMap.get(gender.id)?.label) + | translate + }} +
@if (entry.getTotalCount(gender.id)) { diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/components/mandate-check-list/mandate-check-list.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/components/mandate-check-list/mandate-check-list.component.ts index 2c477f4caa..ae079f2209 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/components/mandate-check-list/mandate-check-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/components/mandate-check-list/mandate-check-list.component.ts @@ -6,15 +6,15 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatSelectModule } from '@angular/material/select'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { StructureLevelRepositoryService } from '@app/gateways/repositories/structure-levels'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { GenderControllerService } from '@app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; import { TranslateModule } from '@ngx-translate/core'; import { BehaviorSubject } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { StructureLevelRepositoryService } from 'src/app/gateways/repositories/structure-levels'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { GenderControllerService } from 'src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; import { GroupControllerService, ViewGroup } from '../../../../modules'; import { ParticipantControllerService } from '../../../../services/common/participant-controller.service'; @@ -110,7 +110,7 @@ class MandateCheckEntry implements Identifiable { ], templateUrl: './mandate-check-list.component.html', styleUrl: './mandate-check-list.component.scss', - changeDetection: ChangeDetectionStrategy.Default + changeDetection: ChangeDetectionStrategy.Eager }) export class MandateCheckListComponent extends BaseMeetingComponent implements OnDestroy, OnInit { public structureLevels: ViewStructureLevel[] = []; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/components/mandate-check-main/mandate-check-main.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/components/mandate-check-main/mandate-check-main.component.ts index fd134e0327..7561c85959 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/components/mandate-check-main/mandate-check-main.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/components/mandate-check-main/mandate-check-main.component.ts @@ -1,8 +1,8 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfig } from 'src/app/domain/interfaces/subscription-config'; -import { BaseMeetingModelRequestHandler } from 'src/app/site/pages/meetings/base/base-meeting-model-request-handler.component'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfig } from '@app/domain/interfaces/subscription-config'; +import { BaseMeetingModelRequestHandler } from '@app/site/pages/meetings/base/base-meeting-model-request-handler.component'; import { getMandateCheckSubscriptionConfig } from '../../mandate-check.subscription'; @@ -10,6 +10,7 @@ import { getMandateCheckSubscriptionConfig } from '../../mandate-check.subscript selector: 'os-mandate-check-main', imports: [RouterModule], templateUrl: './mandate-check-main.component.html', + changeDetection: ChangeDetectionStrategy.Eager, styleUrl: './mandate-check-main.component.scss' }) export class MandateCheckMainComponent extends BaseMeetingModelRequestHandler { diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/mandate-check.routing.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/mandate-check.routing.module.ts index 588274d92b..aa86f7bf33 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/mandate-check.routing.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/mandate-check.routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Permission } from 'src/app/domain/definitions/permission'; +import { Permission } from '@app/domain/definitions/permission'; import { MandateCheckMainComponent } from './components/mandate-check-main/mandate-check-main.component'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/mandate-check.subscription.ts b/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/mandate-check.subscription.ts index dfbbdea201..bfcd0f4c47 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/mandate-check.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/mandate-check/mandate-check.subscription.ts @@ -1,7 +1,7 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { UserFieldsets } from 'src/app/domain/fieldsets/user'; -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; +import { Id } from '@app/domain/definitions/key-types'; +import { UserFieldsets } from '@app/domain/fieldsets/user'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; export const MANDATE_CHECK_SUBSCRIPTION = `mandate-check`; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-edit/participant-detail-edit.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-edit/participant-detail-edit.component.ts index 2dfa335a05..ca1342aaa9 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-edit/participant-detail-edit.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-edit/participant-detail-edit.component.ts @@ -1,27 +1,27 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; import { Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; -import { _ } from '@ngx-translate/core'; -import { TranslateService } from '@ngx-translate/core'; -import { combineLatest, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { CML, OML } from 'src/app/domain/definitions/organization-permission'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { UserDetailViewComponent } from 'src/app/site/modules/user-components'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; +import { Id } from '@app/domain/definitions/key-types'; +import { CML, OML } from '@app/domain/definitions/organization-permission'; +import { Permission } from '@app/domain/definitions/permission'; +import { UserDetailViewComponent } from '@app/site/modules/user-components'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; import { MEETING_RELATED_FORM_CONTROLS, ParticipantControllerService -} from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; -import { PERSONAL_FORM_CONTROLS, ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { getCommitteeListMinimalSubscriptionConfig } from 'src/app/site/pages/organization/pages/committees/committees.subscription'; -import { CommitteeSortService } from 'src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service'; -import { CommitteeControllerService } from 'src/app/site/pages/organization/pages/committees/services/committee-controller.service'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { UserService } from 'src/app/site/services/user.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; +} from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; +import { PERSONAL_FORM_CONTROLS, ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { getCommitteeListMinimalSubscriptionConfig } from '@app/site/pages/organization/pages/committees/committees.subscription'; +import { CommitteeSortService } from '@app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service'; +import { CommitteeControllerService } from '@app/site/pages/organization/pages/committees/services/committee-controller.service'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { UserService } from '@app/site/services/user.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; +import { _ } from '@ngx-translate/core'; +import { TranslateService } from '@ngx-translate/core'; +import { combineLatest, Observable } from 'rxjs'; import { GroupControllerService } from '../../../../modules'; import { diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-view/participant-detail-view.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-view/participant-detail-view.component.ts index 39b248047d..10cdf7090d 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-view/participant-detail-view.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail-view/participant-detail-view.component.ts @@ -1,21 +1,21 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component } from '@angular/core'; import { Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { Permission } from '@app/domain/definitions/permission'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { UserService } from '@app/site/services/user.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { combineLatest, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { UserService } from 'src/app/site/services/user.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { ParticipantPdfExportService } from '../../../../export/participant-pdf-export.service'; import { GroupControllerService } from '../../../../modules'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail/participant-detail.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail/participant-detail.component.ts index 2fe43a54b2..b7540bdac4 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail/participant-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/components/participant-detail/participant-detail.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; import { getParticipantDetailSubscription } from '../../../../participants.subscription'; @@ -7,6 +7,7 @@ import { getParticipantDetailSubscription } from '../../../../participants.subsc selector: `os-participant-detail`, templateUrl: `./participant-detail.component.html`, styleUrls: [`./participant-detail.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ParticipantDetailComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/components/participant-create-wizard/participant-create-wizard.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/components/participant-create-wizard/participant-create-wizard.component.ts index a4e406f562..96f7e0d838 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/components/participant-create-wizard/participant-create-wizard.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/components/participant-create-wizard/participant-create-wizard.component.ts @@ -1,21 +1,21 @@ import { StepperSelectionEvent } from '@angular/cdk/stepper'; -import { Component, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MatStepper } from '@angular/material/stepper'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { User } from '@app/domain/models/users/user'; +import { SearchUsersPresenterService } from '@app/gateways/presenter/search-users-presenter.service'; +import { createEmailValidator } from '@app/infrastructure/utils/validators/email'; +import { OneOfValidator, UserDetailViewComponent } from '@app/site/modules/user-components'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; +import { PERSONAL_FORM_CONTROLS, ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { UserService } from '@app/site/services/user.service'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, distinctUntilChanged, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { User } from 'src/app/domain/models/users/user'; -import { SearchUsersPresenterService } from 'src/app/gateways/presenter/search-users-presenter.service'; -import { createEmailValidator } from 'src/app/infrastructure/utils/validators/email'; -import { OneOfValidator, UserDetailViewComponent } from 'src/app/site/modules/user-components'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; -import { PERSONAL_FORM_CONTROLS, ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; -import { UserService } from 'src/app/site/services/user.service'; import { GroupControllerService } from '../../../../../../modules/groups/services/group-controller.service'; import { @@ -31,6 +31,7 @@ import { ViewStructureLevel } from '../../../../../structure-levels/view-models' selector: `os-participant-create-wizard`, templateUrl: `./participant-create-wizard.component.html`, styleUrls: [`./participant-create-wizard.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ParticipantCreateWizardComponent extends BaseMeetingComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/participant-detail-manage.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/participant-detail-manage.module.ts index 0f92c1be46..d2e8f526c3 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/participant-detail-manage.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/pages/participant-detail-manage/participant-detail-manage.module.ts @@ -9,11 +9,11 @@ import { MatIconModule } from '@angular/material/icon'; import { MatListModule } from '@angular/material/list'; import { MatStepperModule } from '@angular/material/stepper'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { UserComponentsModule } from 'src/app/site/modules/user-components'; -import { EditorModule } from 'src/app/ui/modules/editor'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { UserComponentsModule } from '@app/site/modules/user-components'; +import { EditorModule } from '@app/ui/modules/editor'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; import { ParticipantCreateWizardComponent } from './components/participant-create-wizard/participant-create-wizard.component'; import { ParticipantDetailManageRoutingModule } from './participant-detail-manage-routing.module'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/participant-detail-routing.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/participant-detail-routing.module.ts index 92431124b4..1c76e407f2 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/participant-detail-routing.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/participant-detail-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { PermissionGuard } from 'src/app/site/guards/permission.guard'; +import { Permission } from '@app/domain/definitions/permission'; +import { PermissionGuard } from '@app/site/guards/permission.guard'; import { ParticipantDetailComponent } from './components/participant-detail/participant-detail.component'; import { ParticipantDetailEditComponent } from './components/participant-detail-edit/participant-detail-edit.component'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/participant-detail.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/participant-detail.module.ts index b28447b9f7..763d53b64c 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/participant-detail.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-detail/participant-detail.module.ts @@ -8,16 +8,16 @@ import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { UserComponentsModule } from 'src/app/site/modules/user-components'; -import { CommitteeCommonServiceModule } from 'src/app/site/pages/organization/pages/committees/services/committee-common-service.module'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { EditorModule } from 'src/app/ui/modules/editor'; -import { ExpandableContentWrapperComponent } from 'src/app/ui/modules/expandable-content-wrapper'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; -import { PipesModule } from 'src/app/ui/pipes/pipes.module'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { UserComponentsModule } from '@app/site/modules/user-components'; +import { CommitteeCommonServiceModule } from '@app/site/pages/organization/pages/committees/services/committee-common-service.module'; +import { DirectivesModule } from '@app/ui/directives'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { EditorModule } from '@app/ui/modules/editor'; +import { ExpandableContentWrapperComponent } from '@app/ui/modules/expandable-content-wrapper'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; +import { PipesModule } from '@app/ui/pipes/pipes.module'; import { ParticipantExportModule } from '../../export/participant-export.module'; import { ParticipantDetailComponent } from './components/participant-detail/participant-detail.component'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/components/participant-import-list/participant-import-list.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/components/participant-import-list/participant-import-list.component.ts index f3cd580a13..b22eece89d 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/components/participant-import-list/participant-import-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/components/participant-import-list/participant-import-list.component.ts @@ -1,7 +1,7 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseViaBackendImportListMeetingComponent } from '@app/site/base/base-via-backend-import-list-meeting.component'; +import { ImportListHeaderDefinition } from '@app/ui/modules/import-list'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViaBackendImportListMeetingComponent } from 'src/app/site/base/base-via-backend-import-list-meeting.component'; -import { ImportListHeaderDefinition } from 'src/app/ui/modules/import-list'; import { participantColumns, participantHeadersAndVerboseNames } from '../../definitions'; import { ParticipantImportService } from '../../services'; @@ -10,6 +10,7 @@ import { ParticipantImportService } from '../../services'; selector: `os-participant-import-list`, templateUrl: `./participant-import-list.component.html`, styleUrls: [`./participant-import-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ParticipantImportListComponent extends BaseViaBackendImportListMeetingComponent { diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/definitions/index.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/definitions/index.ts index 45c9834718..ca235418e2 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/definitions/index.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/definitions/index.ts @@ -1,5 +1,5 @@ -import { GeneralUser } from 'src/app/gateways/repositories/users'; -import { userHeadersAndVerboseNames } from 'src/app/site/pages/organization/pages/accounts/pages/account-import/definitions'; +import { GeneralUser } from '@app/gateways/repositories/users'; +import { userHeadersAndVerboseNames } from '@app/site/pages/organization/pages/accounts/pages/account-import/definitions'; export const participantHeadersAndVerboseNames: { [key in keyof GeneralUser]?: any } = { ...userHeadersAndVerboseNames, diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/participant-import.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/participant-import.module.ts index fe142f05bf..1828a59160 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/participant-import.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/participant-import.module.ts @@ -2,10 +2,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { ImportListModule } from 'src/app/ui/modules/import-list'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { ImportListModule } from '@app/ui/modules/import-list'; import { ParticipantImportListComponent } from './components/participant-import-list/participant-import-list.component'; import { ParticipantImportRoutingModule } from './participant-import-routing.module'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/services/participant-import.service/participant-import.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/services/participant-import.service/participant-import.service.ts index 28f6caa749..4ec214098c 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/services/participant-import.service/participant-import.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/services/participant-import.service/participant-import.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; +import { BaseBackendImportService } from '@app/site/base/base-import.service/base-backend-import.service'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { ImportServiceCollectorService } from '@app/site/services/import-service-collector.service'; +import { BackendImportRawPreview } from '@app/ui/modules/import-list/definitions/backend-import-preview'; import { _ } from '@ngx-translate/core'; -import { BaseBackendImportService } from 'src/app/site/base/base-import.service/base-backend-import.service'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { ImportServiceCollectorService } from 'src/app/site/services/import-service-collector.service'; -import { BackendImportRawPreview } from 'src/app/ui/modules/import-list/definitions/backend-import-preview'; import { ParticipantCsvExportService } from '../../../../export/participant-csv-export.service/participant-csv-export.service'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.ts index 2602810c21..b740a4efbe 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-list/participant-list.component.ts @@ -1,26 +1,26 @@ import { ChangeDetectionStrategy, Component, inject, OnInit } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute } from '@angular/router'; +import { Ids } from '@app/domain/definitions/key-types'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { Permission } from '@app/domain/definitions/permission'; +import { GENDERS } from '@app/domain/models/users/user'; +import { UserStateField } from '@app/gateways/repositories/users'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { OsFilterOption } from '@app/site/base/base-filter.service'; +import { BaseMeetingListViewComponent } from '@app/site/pages/meetings/base/base-meeting-list-view.component'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { UserService } from '@app/site/services/user.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { ChoiceService } from '@app/ui/modules/choice-dialog'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { _ } from '@ngx-translate/core'; import { firstValueFrom, map, Observable } from 'rxjs'; -import { Ids } from 'src/app/domain/definitions/key-types'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { GENDERS } from 'src/app/domain/models/users/user'; -import { UserStateField } from 'src/app/gateways/repositories/users'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { OsFilterOption } from 'src/app/site/base/base-filter.service'; -import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { UserService } from 'src/app/site/services/user.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { ChoiceService } from 'src/app/ui/modules/choice-dialog'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { InteractionService } from '../../../../../interaction/services/interaction.service'; import { ParticipantCsvExportService } from '../../../../export/participant-csv-export.service'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-switch-dialog/participant-switch-dialog.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-switch-dialog/participant-switch-dialog.component.ts index f2c653b88f..f7e83c56ac 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-switch-dialog/participant-switch-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/components/participant-switch-dialog/participant-switch-dialog.component.ts @@ -1,8 +1,8 @@ -import { Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { UserRepositoryService } from 'src/app/gateways/repositories/users'; -import { UserSelectionData } from 'src/app/site/pages/meetings/modules/participant-search-selector'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; +import { UserRepositoryService } from '@app/gateways/repositories/users'; +import { UserSelectionData } from '@app/site/pages/meetings/modules/participant-search-selector'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; interface ParticipantSwitchDialogConfig { leftUser: ViewUser; @@ -13,6 +13,7 @@ interface ParticipantSwitchDialogConfig { selector: `os-participant-switch-dialog`, templateUrl: `./participant-switch-dialog.component.html`, styleUrls: [`./participant-switch-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ParticipantSwitchDialogComponent { diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts index 434d1a3393..4b50666ba1 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/components/participant-list-info-dialog/participant-list-info-dialog.component.ts @@ -1,17 +1,17 @@ -import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, OnDestroy, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { Permission } from '@app/domain/definitions/permission'; +import { Selectable } from '@app/domain/interfaces/selectable'; +import { GENDERS } from '@app/domain/models/users/user'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { GroupControllerService } from '@app/site/pages/meetings/pages/participants/modules'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ViewMeetingUser } from '@app/site/pages/meetings/view-models/view-meeting-user'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OperatorService } from '@app/site/services/operator.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { Selectable } from 'src/app/domain/interfaces/selectable'; -import { GENDERS } from 'src/app/domain/models/users/user'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { GroupControllerService } from 'src/app/site/pages/meetings/pages/participants/modules'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { StructureLevelControllerService } from '../../../../../structure-levels/services/structure-level-controller.service'; import { ViewStructureLevel } from '../../../../../structure-levels/view-models'; @@ -22,6 +22,7 @@ import { InfoDialog } from '../../services/participant-list-info-dialog.service' selector: `os-participant-list-info-dialog`, templateUrl: `./participant-list-info-dialog.component.html`, styleUrls: [`./participant-list-info-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ParticipantListInfoDialogComponent extends BaseUiComponent implements OnInit, OnDestroy { diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/participant-list-info-dialog.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/participant-list-info-dialog.module.ts index b8c19ef694..2bc01d3aea 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/participant-list-info-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/participant-list-info-dialog.module.ts @@ -6,8 +6,8 @@ import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; import { ParticipantListInfoDialogComponent } from './components/participant-list-info-dialog/participant-list-info-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts index 574faacc29..bbbcdda69a 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { ParticipantListInfoDialogComponent } from '../components/participant-list-info-dialog/participant-list-info-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/participant-list.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/participant-list.module.ts index 84b9e21d75..9a8feb7cdb 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/participant-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/participant-list.module.ts @@ -6,15 +6,15 @@ import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { UserComponentsModule } from 'src/app/site/modules/user-components'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ChoiceDialogComponent } from 'src/app/ui/modules/choice-dialog'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { PipesModule } from 'src/app/ui/pipes'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { UserComponentsModule } from '@app/site/modules/user-components'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { DirectivesModule } from '@app/ui/directives'; +import { ChoiceDialogComponent } from '@app/ui/modules/choice-dialog'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { PipesModule } from '@app/ui/pipes'; import { ParticipantSearchSelectorModule } from '../../../../modules/participant-search-selector'; import { ParticipantExportModule } from '../../export/participant-export.module'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.ts index a7eef1e187..fc6309fcf8 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; +import { BaseFilterListService, OsFilter, OsHideFilterSetting } from '@app/site/base/base-filter.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { DelegationType } from '@app/site/pages/meetings/view-models/delegation-type'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { GenderControllerService } from '@app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service'; +import { ActiveFiltersService } from '@app/site/services/active-filters.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { _ } from '@ngx-translate/core'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { BaseFilterListService, OsFilter, OsHideFilterSetting } from 'src/app/site/base/base-filter.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 { GenderControllerService } from 'src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service'; -import { ActiveFiltersService } from 'src/app/site/services/active-filters.service'; -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'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service.ts index 0fba88edb2..d3f8b16c19 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-sort/participant-list-sort.service.ts @@ -1,12 +1,12 @@ import { Injectable, ProviderToken } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { UserRepositoryService } from '@app/gateways/repositories/users'; +import { BaseSortListService, OsHideSortingOptionSetting, OsSortingOption } from '@app/site/base/base-sort.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OperatorService } from '@app/site/services/operator.service'; import { _ } from '@ngx-translate/core'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { UserRepositoryService } from 'src/app/gateways/repositories/users'; -import { BaseSortListService, OsHideSortingOptionSetting, OsSortingOption } from 'src/app/site/base/base-sort.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OperatorService } from 'src/app/site/services/operator.service'; @Injectable({ providedIn: `root` diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-password/components/participant-password/participant-password.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-password/components/participant-password/participant-password.component.ts index e8724813c2..3044184557 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-password/components/participant-password/participant-password.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-password/components/participant-password/participant-password.component.ts @@ -1,19 +1,20 @@ -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { Permission } from '@app/domain/definitions/permission'; +import { PasswordForm } from '@app/site/modules/user-components'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OpenSlidesRouterService } from '@app/site/services/openslides-router.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { TranslateService } from '@ngx-translate/core'; import { map, of, switchAll, tap } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { PasswordForm } from 'src/app/site/modules/user-components'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OpenSlidesRouterService } from 'src/app/site/services/openslides-router.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; @Component({ selector: `os-participant-password`, templateUrl: `./participant-password.component.html`, styleUrls: [`./participant-password.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ParticipantPasswordComponent extends BaseMeetingComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-password/participant-password-routing.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-password/participant-password-routing.module.ts index a482752041..c92f49b5d1 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-password/participant-password-routing.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-password/participant-password-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { PermissionGuard } from 'src/app/site/guards/permission.guard'; +import { Permission } from '@app/domain/definitions/permission'; +import { PermissionGuard } from '@app/site/guards/permission.guard'; import { ParticipantPasswordComponent } from './components/participant-password/participant-password.component'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-password/participant-password.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-password/participant-password.module.ts index eebc58a76e..f600a448d5 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-password/participant-password.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-password/participant-password.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { UserComponentsModule } from 'src/app/site/modules/user-components'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { UserComponentsModule } from '@app/site/modules/user-components'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; import { ParticipantPasswordComponent } from './components/participant-password/participant-password.component'; import { ParticipantPasswordRoutingModule } from './participant-password-routing.module'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-presence/components/participant-presence/participant-presence.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-presence/components/participant-presence/participant-presence.component.ts index 75e14d526a..0a7a3c2c6b 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-presence/components/participant-presence/participant-presence.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-presence/components/participant-presence/participant-presence.component.ts @@ -1,13 +1,14 @@ -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; +import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { _ } from '@ngx-translate/core'; -import { ParticipantControllerService } from 'src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; @Component({ selector: `os-participant-presence`, templateUrl: `./participant-presence.component.html`, styleUrls: [`./participant-presence.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ParticipantPresenceComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-presence/participant-presence.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-presence/participant-presence.module.ts index 493e02365c..df0859a46e 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-presence/participant-presence.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-presence/participant-presence.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatCardModule } from '@angular/material/card'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; import { ParticipantPresenceComponent } from './components/participant-presence/participant-presence.component'; import { ParticipantPresenceRoutingModule } from './participant-presence-routing.module'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/components/participant-speaker-list/participant-speaker-list.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/components/participant-speaker-list/participant-speaker-list.component.ts index 9a3223002d..49dcdbd5f8 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/components/participant-speaker-list/participant-speaker-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/components/participant-speaker-list/participant-speaker-list.component.ts @@ -1,11 +1,11 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { modelIcons } from '@app/domain/definitions/model-icons'; +import { SpeechState } from '@app/domain/models/speakers/speech-state'; +import { GENDERS } from '@app/domain/models/users/user'; +import { BaseMeetingListViewComponent } from '@app/site/pages/meetings/base/base-meeting-list-view.component'; +import { OperatorService } from '@app/site/services/operator.service'; import { TranslateService } from '@ngx-translate/core'; import { map, Observable } from 'rxjs'; -import { modelIcons } from 'src/app/domain/definitions/model-icons'; -import { SpeechState } from 'src/app/domain/models/speakers/speech-state'; -import { GENDERS } from 'src/app/domain/models/users/user'; -import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { ViewSpeaker } from '../../../../../agenda'; import { SpeakerControllerService } from '../../../../../agenda/modules/list-of-speakers/services'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/participant-speaker-list.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/participant-speaker-list.module.ts index 5ea64ac576..f802d65868 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/participant-speaker-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/participant-speaker-list.module.ts @@ -5,15 +5,15 @@ import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { UserComponentsModule } from 'src/app/site/modules/user-components'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ChoiceDialogComponent } from 'src/app/ui/modules/choice-dialog'; -import { CommaSeparatedListingComponent } from 'src/app/ui/modules/comma-separated-listing'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { PipesModule } from 'src/app/ui/pipes'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { UserComponentsModule } from '@app/site/modules/user-components'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { DirectivesModule } from '@app/ui/directives'; +import { ChoiceDialogComponent } from '@app/ui/modules/choice-dialog'; +import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { PipesModule } from '@app/ui/pipes'; import { CountdownTimeModule } from '../../../../modules/projector/modules/countdown-time/countdown-time.module'; import { ParticipantExportModule } from '../../export/participant-export.module'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-filter.service/participant-speaker-list-filter.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-filter.service/participant-speaker-list-filter.service.ts index 9633b7865d..f8bc337a02 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-filter.service/participant-speaker-list-filter.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-filter.service/participant-speaker-list-filter.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; +import { SpeechState } from '@app/domain/models/speakers/speech-state'; +import { GENDER_FITLERABLE, GENDERS } from '@app/domain/models/users/user'; +import { BaseFilterListService, OsFilter, OsHideFilterSetting } from '@app/site/base/base-filter.service'; +import { ActiveFiltersService } from '@app/site/services/active-filters.service'; import { _ } from '@ngx-translate/core'; -import { SpeechState } from 'src/app/domain/models/speakers/speech-state'; -import { GENDER_FITLERABLE, GENDERS } from 'src/app/domain/models/users/user'; -import { BaseFilterListService, OsFilter, OsHideFilterSetting } from 'src/app/site/base/base-filter.service'; -import { ActiveFiltersService } from 'src/app/site/services/active-filters.service'; import { SpeechWaitingState, ViewSpeaker } from '../../../../../agenda'; import { StructureLevelControllerService } from '../../../structure-levels/services/structure-level-controller.service'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-sort.service/participant-speaker-list-sort.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-sort.service/participant-speaker-list-sort.service.ts index a81159a216..151d7782d8 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-sort.service/participant-speaker-list-sort.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-sort.service/participant-speaker-list-sort.service.ts @@ -1,8 +1,8 @@ import { Injectable, ProviderToken } from '@angular/core'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { SpeakerRepositoryService } from '@app/gateways/repositories/speakers/speaker-repository.service'; +import { BaseSortListService, OsSortingOption } from '@app/site/base/base-sort.service'; import { _ } from '@ngx-translate/core'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { SpeakerRepositoryService } from 'src/app/gateways/repositories/speakers/speaker-repository.service'; -import { BaseSortListService, OsSortingOption } from 'src/app/site/base/base-sort.service'; import { ViewSpeaker } from '../../../../../agenda'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/components/structure-level-list/structure-level-list.component.ts b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/components/structure-level-list/structure-level-list.component.ts index 224a20f348..c421fafb5b 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/components/structure-level-list/structure-level-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/components/structure-level-list/structure-level-list.component.ts @@ -1,13 +1,13 @@ -import { ChangeDetectorRef, Component, TemplateRef, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, TemplateRef, ViewChild } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { Permission } from '@app/domain/definitions/permission'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseMeetingListViewComponent } from '@app/site/pages/meetings/base/base-meeting-list-view.component'; +import { ViewStructureLevel } from '@app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; +import { OperatorService } from '@app/site/services/operator.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; -import { ViewStructureLevel } from 'src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { StructureLevelControllerService } from '../../services/structure-level-controller.service'; import { StructureLevelSortService } from '../../services/structure-level-sort.service'; @@ -16,6 +16,7 @@ import { StructureLevelSortService } from '../../services/structure-level-sort.s selector: `os-structure-level-list`, templateUrl: `./structure-level-list.component.html`, styleUrls: [`./structure-level-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class StructureLevelListComponent extends BaseMeetingListViewComponent { diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-controller.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-controller.service.ts index 3ae3a71a7f..0ff80083ed 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-controller.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { StructureLevel } from '@app/domain/models/structure-levels/structure-level'; +import { StructureLevelRepositoryService } from '@app/gateways/repositories/structure-levels'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { StructureLevel } from 'src/app/domain/models/structure-levels/structure-level'; -import { StructureLevelRepositoryService } from 'src/app/gateways/repositories/structure-levels'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; import { ViewStructureLevel } from '../view-models/view-structure-level'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-sort.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-sort.service.ts index fee57b01ef..4dc01c4d19 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-sort.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-sort.service.ts @@ -1,8 +1,8 @@ import { Injectable, ProviderToken } from '@angular/core'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { StructureLevelRepositoryService } from 'src/app/gateways/repositories/structure-levels'; -import { BaseSortListService, OsSortingOption } from 'src/app/site/base/base-sort.service'; -import { ViewStructureLevel } from 'src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { StructureLevelRepositoryService } from '@app/gateways/repositories/structure-levels'; +import { BaseSortListService, OsSortingOption } from '@app/site/base/base-sort.service'; +import { ViewStructureLevel } from '@app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; @Injectable({ providedIn: `root` diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/structure-level.module.ts b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/structure-level.module.ts index a3fbd24e99..1db7494083 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/structure-level.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/structure-level.module.ts @@ -11,13 +11,13 @@ import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ChoiceDialogComponent } from 'src/app/ui/modules/choice-dialog'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { ListModule } from 'src/app/ui/modules/list'; -import { PipesModule } from 'src/app/ui/pipes'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { ChoiceDialogComponent } from '@app/ui/modules/choice-dialog'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { ListModule } from '@app/ui/modules/list'; +import { PipesModule } from '@app/ui/pipes'; import { StructureLevelListComponent } from './components/structure-level-list/structure-level-list.component'; import { StructureLevelRoutingModule } from './structure-level-routing.module'; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models/view-structure-level-list-of-speakers.ts b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models/view-structure-level-list-of-speakers.ts index 912b4900ac..c25b740633 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models/view-structure-level-list-of-speakers.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models/view-structure-level-list-of-speakers.ts @@ -1,10 +1,10 @@ -import { SPECIAL_SPEECH_STATES } from 'src/app/domain/models/speakers/speech-state'; -import { StructureLevelListOfSpeakers } from 'src/app/domain/models/structure-levels/structure-level-list-of-speakers'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { CountdownData } from 'src/app/site/pages/meetings/modules/projector/modules/countdown-time/countdown-time.component'; -import { ViewListOfSpeakers, ViewSpeaker } from 'src/app/site/pages/meetings/pages/agenda'; -import { ViewStructureLevel } from 'src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; -import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting'; +import { SPECIAL_SPEECH_STATES } from '@app/domain/models/speakers/speech-state'; +import { StructureLevelListOfSpeakers } from '@app/domain/models/structure-levels/structure-level-list-of-speakers'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; +import { CountdownData } from '@app/site/pages/meetings/modules/projector/modules/countdown-time/countdown-time.component'; +import { ViewListOfSpeakers, ViewSpeaker } from '@app/site/pages/meetings/pages/agenda'; +import { ViewStructureLevel } from '@app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; +import { HasMeeting } from '@app/site/pages/meetings/view-models/has-meeting'; export class ViewStructureLevelListOfSpeakers extends BaseViewModel { public static COLLECTION = StructureLevelListOfSpeakers.COLLECTION; diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models/view-structure-level.ts b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models/view-structure-level.ts index f9ad0800d3..b9fa3a51d0 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models/view-structure-level.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/view-models/view-structure-level.ts @@ -1,7 +1,7 @@ -import { StructureLevel } from 'src/app/domain/models/structure-levels/structure-level'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting'; -import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user'; +import { StructureLevel } from '@app/domain/models/structure-levels/structure-level'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; +import { HasMeeting } from '@app/site/pages/meetings/view-models/has-meeting'; +import { ViewMeetingUser } from '@app/site/pages/meetings/view-models/view-meeting-user'; import { ViewStructureLevelListOfSpeakers } from './view-structure-level-list-of-speakers'; diff --git a/client/src/app/site/pages/meetings/pages/participants/participants-routing.module.ts b/client/src/app/site/pages/meetings/pages/participants/participants-routing.module.ts index 0229f459d8..5391b67413 100644 --- a/client/src/app/site/pages/meetings/pages/participants/participants-routing.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/participants-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { Permission } from 'src/app/domain/definitions/permission'; +import { Permission } from '@app/domain/definitions/permission'; import { ParticipantMainComponent } from './components/participant-main/participant-main.component'; diff --git a/client/src/app/site/pages/meetings/pages/participants/participants.config.ts b/client/src/app/site/pages/meetings/pages/participants/participants.config.ts index 01faa24050..ca27c2b3b2 100644 --- a/client/src/app/site/pages/meetings/pages/participants/participants.config.ts +++ b/client/src/app/site/pages/meetings/pages/participants/participants.config.ts @@ -1,11 +1,11 @@ -import { Permission } from 'src/app/domain/definitions/permission'; -import { StructureLevel } from 'src/app/domain/models/structure-levels/structure-level'; -import { Group } from 'src/app/domain/models/users/group'; -import { User } from 'src/app/domain/models/users/user'; -import { GroupRepositoryService } from 'src/app/gateways/repositories/groups'; -import { StructureLevelRepositoryService } from 'src/app/gateways/repositories/structure-levels'; -import { UserRepositoryService } from 'src/app/gateways/repositories/users'; -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; +import { Permission } from '@app/domain/definitions/permission'; +import { StructureLevel } from '@app/domain/models/structure-levels/structure-level'; +import { Group } from '@app/domain/models/users/group'; +import { User } from '@app/domain/models/users/user'; +import { GroupRepositoryService } from '@app/gateways/repositories/groups'; +import { StructureLevelRepositoryService } from '@app/gateways/repositories/structure-levels'; +import { UserRepositoryService } from '@app/gateways/repositories/users'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; import { ViewUser } from '../../view-models/view-user'; import { ViewGroup } from './modules'; diff --git a/client/src/app/site/pages/meetings/pages/participants/participants.subscription.ts b/client/src/app/site/pages/meetings/pages/participants/participants.subscription.ts index 71b71b1cb7..6664a9606e 100644 --- a/client/src/app/site/pages/meetings/pages/participants/participants.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/participants/participants.subscription.ts @@ -1,9 +1,9 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { FULL_FIELDSET, MEETING_ROUTING_FIELDS } from 'src/app/domain/fieldsets/misc'; -import { MeetingUserFieldsets } from 'src/app/domain/fieldsets/user'; -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { DEFAULT_FIELDSET } from 'src/app/site/services/model-request-builder'; +import { Id } from '@app/domain/definitions/key-types'; +import { FULL_FIELDSET, MEETING_ROUTING_FIELDS } from '@app/domain/fieldsets/misc'; +import { MeetingUserFieldsets } from '@app/domain/fieldsets/user'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { DEFAULT_FIELDSET } from '@app/site/services/model-request-builder'; import { ViewUser } from '../../view-models/view-user'; diff --git a/client/src/app/site/pages/meetings/pages/participants/services/common/participant-common-service.module.ts b/client/src/app/site/pages/meetings/pages/participants/services/common/participant-common-service.module.ts index d6a274abe3..65f401166f 100644 --- a/client/src/app/site/pages/meetings/pages/participants/services/common/participant-common-service.module.ts +++ b/client/src/app/site/pages/meetings/pages/participants/services/common/participant-common-service.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { UserComponentsModule } from 'src/app/site/modules/user-components'; +import { UserComponentsModule } from '@app/site/modules/user-components'; @NgModule({ imports: [UserComponentsModule] diff --git a/client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.ts b/client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.ts index 7078c17792..70bcea8d17 100644 --- a/client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.ts @@ -1,4 +1,30 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { MeetingUser } from '@app/domain/models/meeting-users/meeting-user'; +import { User } from '@app/domain/models/users/user'; +import { Action, ActionService } from '@app/gateways/actions'; +import { GetUserRelatedModelsPresenterService, GetUserScopePresenterService } from '@app/gateways/presenter'; +import { MeetingUserRepositoryService } from '@app/gateways/repositories/meeting_user'; +import { + ExtendedUserPatchFn, + RawUser, + UserPatchFn, + UserRepositoryService, + UserStateField +} from '@app/gateways/repositories/users'; +import { UserAction } from '@app/gateways/repositories/users/user-action'; +import { toDecimal } from '@app/infrastructure/utils'; +import { UserDeleteDialogService } from '@app/site/modules/user-components'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { ViewMeetingUser } from '@app/site/pages/meetings/view-models/view-meeting-user'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { UserService } from '@app/site/services/user.service'; +import { CreateUserNameInformation, UserControllerService } from '@app/site/services/user-controller.service'; +import { BackendImportRawPreview } from '@app/ui/modules/import-list/definitions/backend-import-preview'; import { auditTime, BehaviorSubject, @@ -12,32 +38,6 @@ import { switchAll, tap } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { MeetingUser } from 'src/app/domain/models/meeting-users/meeting-user'; -import { User } from 'src/app/domain/models/users/user'; -import { Action, ActionService } from 'src/app/gateways/actions'; -import { GetUserRelatedModelsPresenterService, GetUserScopePresenterService } from 'src/app/gateways/presenter'; -import { MeetingUserRepositoryService } from 'src/app/gateways/repositories/meeting_user'; -import { - ExtendedUserPatchFn, - RawUser, - UserPatchFn, - UserRepositoryService, - UserStateField -} from 'src/app/gateways/repositories/users'; -import { UserAction } from 'src/app/gateways/repositories/users/user-action'; -import { toDecimal } from 'src/app/infrastructure/utils'; -import { UserDeleteDialogService } from 'src/app/site/modules/user-components'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { ViewMeetingUser } from 'src/app/site/pages/meetings/view-models/view-meeting-user'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { UserService } from 'src/app/site/services/user.service'; -import { CreateUserNameInformation, UserControllerService } from 'src/app/site/services/user-controller.service'; -import { BackendImportRawPreview } from 'src/app/ui/modules/import-list/definitions/backend-import-preview'; export const MEETING_RELATED_FORM_CONTROLS = [ `structure_level_ids`, diff --git a/client/src/app/site/pages/meetings/pages/polls/components/poll-main/poll-main.component.ts b/client/src/app/site/pages/meetings/pages/polls/components/poll-main/poll-main.component.ts index 90d8878772..2751f2ce70 100644 --- a/client/src/app/site/pages/meetings/pages/polls/components/poll-main/poll-main.component.ts +++ b/client/src/app/site/pages/meetings/pages/polls/components/poll-main/poll-main.component.ts @@ -1,6 +1,6 @@ -import { Component } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfig } from 'src/app/domain/interfaces/subscription-config'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfig } from '@app/domain/interfaces/subscription-config'; import { BaseMeetingModelRequestHandler } from '../../../../base/base-meeting-model-request-handler.component'; import { getPollListSubscriptionConfig } from '../../polls.subscription'; @@ -9,6 +9,7 @@ import { getPollListSubscriptionConfig } from '../../polls.subscription'; selector: `os-poll-main`, templateUrl: `./poll-main.component.html`, styleUrls: [`./poll-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class PollMainComponent extends BaseMeetingModelRequestHandler { diff --git a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/components/poll-list/poll-list.component.ts b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/components/poll-list/poll-list.component.ts index 5733e9f15a..c0c2d36744 100644 --- a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/components/poll-list/poll-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/components/poll-list/poll-list.component.ts @@ -1,9 +1,9 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { PollState } from '@app/domain/models/poll/poll-constants'; +import { BaseMeetingListViewComponent } from '@app/site/pages/meetings/base/base-meeting-list-view.component'; +import { PollControllerService } from '@app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service'; +import { VotingService } from '@app/site/pages/meetings/modules/poll/services/voting.service'; import { TranslateService } from '@ngx-translate/core'; -import { PollState } from 'src/app/domain/models/poll/poll-constants'; -import { BaseMeetingListViewComponent } from 'src/app/site/pages/meetings/base/base-meeting-list-view.component'; -import { PollControllerService } from 'src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service'; -import { VotingService } from 'src/app/site/pages/meetings/modules/poll/services/voting.service'; import { ViewPoll } from '../../../../view-models'; import { PollListFilterService } from '../../services/poll-list-filter.service/poll-list-filter.service'; @@ -14,6 +14,7 @@ const POLL_LIST_STORAGE_INDEX = `polls`; selector: `os-poll-list`, templateUrl: `./poll-list.component.html`, styleUrls: [`./poll-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class PollListComponent extends BaseMeetingListViewComponent { diff --git a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/poll-list.module.ts b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/poll-list.module.ts index b31979404a..c0e4862822 100644 --- a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/poll-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/poll-list.module.ts @@ -2,9 +2,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; import { PollListComponent } from './components/poll-list/poll-list.component'; import { PollListRoutingModule } from './poll-list-routing.module'; diff --git a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.ts b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.ts index d50d559b96..d60a4281ac 100644 --- a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.ts +++ b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; +import { PollState } from '@app/domain/models/poll/poll-constants'; +import { BaseFilterListService, OsFilter } from '@app/site/base/base-filter.service'; +import { ActiveFiltersService } from '@app/site/services/active-filters.service'; import { TranslateService } from '@ngx-translate/core'; -import { PollState } from 'src/app/domain/models/poll/poll-constants'; -import { BaseFilterListService, OsFilter } from 'src/app/site/base/base-filter.service'; -import { ActiveFiltersService } from 'src/app/site/services/active-filters.service'; import { ViewPoll } from '../../../../view-models'; diff --git a/client/src/app/site/pages/meetings/pages/polls/polls.config.ts b/client/src/app/site/pages/meetings/pages/polls/polls.config.ts index 4f5524260b..d3c9774d67 100644 --- a/client/src/app/site/pages/meetings/pages/polls/polls.config.ts +++ b/client/src/app/site/pages/meetings/pages/polls/polls.config.ts @@ -1,13 +1,13 @@ -import { Option } from 'src/app/domain/models/poll/option'; -import { Poll } from 'src/app/domain/models/poll/poll'; -import { Vote } from 'src/app/domain/models/poll/vote'; -import { PollCandidate } from 'src/app/domain/models/poll-candidate-lists/poll-candidate'; -import { PollCandidateList } from 'src/app/domain/models/poll-candidate-lists/poll-candidate-list'; -import { PollCandidateRepositoryService } from 'src/app/gateways/repositories/poll-candidate-lists/poll-candidate'; -import { PollCandidateListRepositoryService } from 'src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list'; -import { OptionRepositoryService } from 'src/app/gateways/repositories/polls/option-repository.service'; -import { PollRepositoryService } from 'src/app/gateways/repositories/polls/poll-repository.service'; -import { VoteRepositoryService } from 'src/app/gateways/repositories/polls/vote-repository.service'; +import { Option } from '@app/domain/models/poll/option'; +import { Poll } from '@app/domain/models/poll/poll'; +import { Vote } from '@app/domain/models/poll/vote'; +import { PollCandidate } from '@app/domain/models/poll-candidate-lists/poll-candidate'; +import { PollCandidateList } from '@app/domain/models/poll-candidate-lists/poll-candidate-list'; +import { PollCandidateRepositoryService } from '@app/gateways/repositories/poll-candidate-lists/poll-candidate'; +import { PollCandidateListRepositoryService } from '@app/gateways/repositories/poll-candidate-lists/poll-candidate-list'; +import { OptionRepositoryService } from '@app/gateways/repositories/polls/option-repository.service'; +import { PollRepositoryService } from '@app/gateways/repositories/polls/poll-repository.service'; +import { VoteRepositoryService } from '@app/gateways/repositories/polls/vote-repository.service'; import { AppConfig } from '../../../../../infrastructure/definitions/app-config'; import { ViewOption, ViewPoll, ViewVote } from './view-models'; diff --git a/client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts b/client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts index a053fd12df..6e616a9ee9 100644 --- a/client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/polls/polls.subscription.ts @@ -1,8 +1,8 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { FULL_FIELDSET, MEETING_ROUTING_FIELDS } from 'src/app/domain/fieldsets/misc'; -import { MeetingUserFieldsets, UserFieldsets } from 'src/app/domain/fieldsets/user'; -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; -import { BaseSimplifiedModelRequest } from 'src/app/site/services/model-request-builder'; +import { Id } from '@app/domain/definitions/key-types'; +import { FULL_FIELDSET, MEETING_ROUTING_FIELDS } from '@app/domain/fieldsets/misc'; +import { MeetingUserFieldsets, UserFieldsets } from '@app/domain/fieldsets/user'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; +import { BaseSimplifiedModelRequest } from '@app/site/services/model-request-builder'; import { ViewMeeting } from '../../view-models/view-meeting'; import { ViewPoll } from './view-models'; diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/has-polls.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/has-polls.ts index 377f0c174c..a4bf54b88b 100644 --- a/client/src/app/site/pages/meetings/pages/polls/view-models/has-polls.ts +++ b/client/src/app/site/pages/meetings/pages/polls/view-models/has-polls.ts @@ -1,5 +1,5 @@ -import { PollContentObject } from 'src/app/domain/models/poll'; -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { PollContentObject } from '@app/domain/models/poll'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; import { ViewPoll } from './view-poll'; diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list.ts index 5230fea91e..eaeab2bd0e 100644 --- a/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list.ts +++ b/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list.ts @@ -1,5 +1,5 @@ -import { PollCandidateList } from 'src/app/domain/models/poll-candidate-lists/poll-candidate-list'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { PollCandidateList } from '@app/domain/models/poll-candidate-lists/poll-candidate-list'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; import { HasMeeting } from '../../../view-models/has-meeting'; import { SortedList, SortedListEntry } from './sorted-list'; diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate.ts index c0bf41c176..bcf2658bdb 100644 --- a/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate.ts +++ b/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate.ts @@ -1,5 +1,5 @@ -import { PollCandidate } from 'src/app/domain/models/poll-candidate-lists/poll-candidate'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { PollCandidate } from '@app/domain/models/poll-candidate-lists/poll-candidate'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; import { HasMeeting } from '../../../view-models/has-meeting'; import { ViewUser } from '../../../view-models/view-user'; diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll.ts index 1d52a18429..90a566d7d2 100644 --- a/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll.ts +++ b/client/src/app/site/pages/meetings/pages/polls/view-models/view-poll.ts @@ -1,5 +1,4 @@ -import { _ } from '@ngx-translate/core'; -import { DetailNavigable } from 'src/app/domain/interfaces'; +import { DetailNavigable } from '@app/domain/interfaces'; import { PollClassType, PollClassTypeVerbose, @@ -12,15 +11,16 @@ import { PollType, PollTypeVerbose, VOTE_MAJORITY -} from 'src/app/domain/models/poll'; -import { Poll } from 'src/app/domain/models/poll/poll'; -import { PROJECTIONDEFAULT, ProjectiondefaultValue } from 'src/app/domain/models/projector/projection-default'; -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { ViewOption } from 'src/app/site/pages/meetings/pages/polls'; -import { BaseProjectableViewModel, ProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models'; -import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; +} from '@app/domain/models/poll'; +import { Poll } from '@app/domain/models/poll/poll'; +import { PROJECTIONDEFAULT, ProjectiondefaultValue } from '@app/domain/models/projector/projection-default'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { ViewOption } from '@app/site/pages/meetings/pages/polls'; +import { BaseProjectableViewModel, ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models'; +import { HasMeeting } from '@app/site/pages/meetings/view-models/has-meeting'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { _ } from '@ngx-translate/core'; import { MeetingSettingsService } from '../../../services/meeting-settings.service'; import { SlideOptions } from '../../../view-models/slide-options'; diff --git a/client/src/app/site/pages/meetings/pages/polls/view-models/view-vote.ts b/client/src/app/site/pages/meetings/pages/polls/view-models/view-vote.ts index ab4bf9ff72..0d350fc72d 100644 --- a/client/src/app/site/pages/meetings/pages/polls/view-models/view-vote.ts +++ b/client/src/app/site/pages/meetings/pages/polls/view-models/view-vote.ts @@ -1,4 +1,4 @@ -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; import { Vote } from '../../../../../../domain/models/poll/vote'; import { BaseViewModel, ViewModelRelations } from '../../../../../base/base-view-model'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.ts index 4e671676a7..01ea3c138d 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/components/projector-countdown-dialog/projector-countdown-dialog.component.ts @@ -1,9 +1,9 @@ -import { Component, Inject, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { DurationService } from '@app/site/services/duration.service'; import { TranslateService } from '@ngx-translate/core'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { DurationService } from 'src/app/site/services/duration.service'; import { CountdownDialogData } from '../../definitions'; @@ -11,6 +11,7 @@ import { CountdownDialogData } from '../../definitions'; selector: `os-projector-countdown-dialog`, templateUrl: `./projector-countdown-dialog.component.html`, styleUrls: [`./projector-countdown-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ProjectorCountdownDialogComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/projector-countdown-dialog.module.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/projector-countdown-dialog.module.ts index f2c6a43790..295a970524 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/projector-countdown-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/projector-countdown-dialog.module.ts @@ -5,7 +5,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { ProjectorCountdownDialogComponent } from './components/projector-countdown-dialog/projector-countdown-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/services/projector-countdown-dialog.service.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/services/projector-countdown-dialog.service.ts index 18bba0e998..fedc8bb048 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/services/projector-countdown-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/services/projector-countdown-dialog.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { ProjectorCountdownDialogComponent } from '../components/projector-countdown-dialog/projector-countdown-dialog.component'; import { CountdownDialogData } from '../definitions'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.ts index eec899d1ba..6149d2ff50 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.ts @@ -11,19 +11,19 @@ import { } from '@angular/core'; import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { _ } from '@ngx-translate/core'; -import { auditTime } from 'rxjs'; import { PROJECTIONDEFAULT, PROJECTIONDEFAULT_KEYS, PROJECTIONDEFAULT_VERBOSE -} from 'src/app/domain/models/projector/projection-default'; -import { Projector } from 'src/app/domain/models/projector/projector'; -import { HttpService } from 'src/app/gateways/http.service'; -import { ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; +} from '@app/domain/models/projector/projection-default'; +import { Projector } from '@app/domain/models/projector/projector'; +import { HttpService } from '@app/gateways/http.service'; +import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; +import { _ } from '@ngx-translate/core'; +import { auditTime } from 'rxjs'; const ASPECT_RATIO_FORM_KEY = `aspectRatio`; diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts index 2b9d64e3f1..28040be5a4 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts @@ -12,7 +12,7 @@ import { MatRadioModule } from '@angular/material/radio'; import { MatSelectModule } from '@angular/material/select'; import { MatSliderModule } from '@angular/material/slider'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { ProjectorComponent } from '../../../../modules/projector/components/projector/projector.component'; import { ProjectorModule } from '../../../../modules/projector/projector.module'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/services/projector-edit-dialog.service.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/services/projector-edit-dialog.service.ts index 36fcccecae..438caeb523 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/services/projector-edit-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/services/projector-edit-dialog.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { Projector } from 'src/app/domain/models/projector/projector'; -import { largeDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; -import { ProjectorControllerService } from 'src/app/site/pages/meetings/pages/projectors/services/projector-controller.service'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { Projector } from '@app/domain/models/projector/projector'; +import { largeDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; +import { ProjectorControllerService } from '@app/site/pages/meetings/pages/projectors/services/projector-controller.service'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { ProjectorEditDialogComponent } from '../components/projector-edit-dialog/projector-edit-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-main/projector-main.component.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-main/projector-main.component.ts index 5a0276e306..76899c3269 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-main/projector-main.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-main/projector-main.component.ts @@ -1,6 +1,6 @@ -import { Component } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfig } from 'src/app/domain/interfaces/subscription-config'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfig } from '@app/domain/interfaces/subscription-config'; import { BaseMeetingModelRequestHandler } from '../../../../base/base-meeting-model-request-handler.component'; import { getProjectorListSubscriptionConfig } from '../../projectors.subscription'; @@ -9,6 +9,7 @@ import { getProjectorListSubscriptionConfig } from '../../projectors.subscriptio selector: `os-projector-main`, templateUrl: `./projector-main.component.html`, styleUrls: [`./projector-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ProjectorMainComponent extends BaseMeetingModelRequestHandler { diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/components/projector-message-dialog/projector-message-dialog.component.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/components/projector-message-dialog/projector-message-dialog.component.ts index 6af0045f70..5c146e6c44 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/components/projector-message-dialog/projector-message-dialog.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/components/projector-message-dialog/projector-message-dialog.component.ts @@ -1,8 +1,8 @@ -import { Component, Inject, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { BaseComponent } from '@app/site/base/base.component'; import { TranslateService } from '@ngx-translate/core'; -import { BaseComponent } from 'src/app/site/base/base.component'; import { MessageDialogData } from '../../definitions'; @@ -10,6 +10,7 @@ import { MessageDialogData } from '../../definitions'; selector: `os-projector-message-dialog`, templateUrl: `./projector-message-dialog.component.html`, styleUrls: [`./projector-message-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ProjectorMessageDialogComponent extends BaseComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/projector-message-dialog.module.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/projector-message-dialog.module.ts index 532e9186ad..8e2a2413fa 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/projector-message-dialog.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/projector-message-dialog.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { EditorModule } from 'src/app/ui/modules/editor'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { EditorModule } from '@app/ui/modules/editor'; import { ProjectorMessageDialogComponent } from './components/projector-message-dialog/projector-message-dialog.component'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/services/projector-message-dialog.service.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/services/projector-message-dialog.service.ts index 9ec66dc082..6f1b4a30c6 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/services/projector-message-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/services/projector-message-dialog.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { largeDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { largeDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { ProjectorMessageDialogComponent } from '../components/projector-message-dialog/projector-message-dialog.component'; import { MessageDialogData } from '../definitions'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/definitions/slide-data.ts b/client/src/app/site/pages/meetings/pages/projectors/definitions/slide-data.ts index 4250a93ecb..cc217e7805 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/definitions/slide-data.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/definitions/slide-data.ts @@ -1,4 +1,4 @@ -import { Collection } from 'src/app/domain/definitions/key-types'; +import { Collection } from '@app/domain/definitions/key-types'; export interface SlideData { collection: Collection; data: T; diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/components/fullscreen-projector-detail/fullscreen-projector-detail.component.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/components/fullscreen-projector-detail/fullscreen-projector-detail.component.ts index 7bf1b686fe..1f181f3236 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/components/fullscreen-projector-detail/fullscreen-projector-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/components/fullscreen-projector-detail/fullscreen-projector-detail.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit, ViewContainerRef } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { DomService } from 'src/app/openslides-main-module/services/dom.service'; -import { ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; -import { SequentialNumberMappingService } from 'src/app/site/pages/meetings/services/sequential-number-mapping.service'; -import { OpenSlidesRouterService } from 'src/app/site/services/openslides-router.service'; +import { ChangeDetectionStrategy, Component, OnInit, ViewContainerRef } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { DomService } from '@app/openslides-main-module/services/dom.service'; +import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; +import { SequentialNumberMappingService } from '@app/site/pages/meetings/services/sequential-number-mapping.service'; +import { OpenSlidesRouterService } from '@app/site/services/openslides-router.service'; import { FullscreenProjectorComponent } from '../fullscreen-projector/fullscreen-projector.component'; @@ -11,6 +11,7 @@ import { FullscreenProjectorComponent } from '../fullscreen-projector/fullscreen selector: `os-fullscreen-projector-detail`, templateUrl: `./fullscreen-projector-detail.component.html`, styleUrls: [`./fullscreen-projector-detail.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class FullscreenProjectorDetailComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/components/fullscreen-projector-main/fullscreen-projector-main.component.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/components/fullscreen-projector-main/fullscreen-projector-main.component.ts index f9a0ab8825..31e930280a 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/components/fullscreen-projector-main/fullscreen-projector-main.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/components/fullscreen-projector-main/fullscreen-projector-main.component.ts @@ -1,7 +1,7 @@ -import { Component } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; -import { SequentialNumberMappingService } from 'src/app/site/pages/meetings/services/sequential-number-mapping.service'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; +import { SequentialNumberMappingService } from '@app/site/pages/meetings/services/sequential-number-mapping.service'; import { getProjectorSubscriptionConfig } from '../../../../projectors.subscription'; import { ViewProjector } from '../../../../view-models'; @@ -10,6 +10,7 @@ import { ViewProjector } from '../../../../view-models'; selector: `os-fullscreen-projector-main`, templateUrl: `./fullscreen-projector-main.component.html`, styleUrls: [`./fullscreen-projector-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class FullscreenProjectorMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/components/fullscreen-projector/fullscreen-projector.component.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/components/fullscreen-projector/fullscreen-projector.component.ts index f54e2ed57f..d555a24f9a 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/components/fullscreen-projector/fullscreen-projector.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/components/fullscreen-projector/fullscreen-projector.component.ts @@ -1,8 +1,8 @@ -import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; -import { ProjectorControllerService } from 'src/app/site/pages/meetings/pages/projectors/services/projector-controller.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; +import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; +import { Permission } from '@app/domain/definitions/permission'; +import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; +import { ProjectorControllerService } from '@app/site/pages/meetings/pages/projectors/services/projector-controller.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { Dimension } from '../../../../definitions'; @@ -10,6 +10,7 @@ import { Dimension } from '../../../../definitions'; selector: `os-fullscreen-projector`, templateUrl: `./fullscreen-projector.component.html`, styleUrls: [`./fullscreen-projector.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class FullscreenProjectorComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/fullscreen-projector.module.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/fullscreen-projector.module.ts index c3d01cd596..3cd2941625 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/fullscreen-projector.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/fullscreen-projector/fullscreen-projector.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { DirectivesModule } from 'src/app/ui/directives'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { DirectivesModule } from '@app/ui/directives'; import { ProjectorComponent } from '../../../../modules/projector/components/projector/projector.component'; import { ProjectorModule } from '../../../../modules/projector/projector.module'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/countdown-controls/countdown-controls.component.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/countdown-controls/countdown-controls.component.ts index 4143c8e03d..81d3b2e28b 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/countdown-controls/countdown-controls.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/countdown-controls/countdown-controls.component.ts @@ -1,11 +1,11 @@ -import { Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { ProjectorCountdown } from '@app/domain/models/projector/projector-countdown'; +import { ProjectionDialogService } from '@app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service'; +import { ViewProjector, ViewProjectorCountdown } from '@app/site/pages/meetings/pages/projectors'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { DurationService } from '@app/site/services/duration.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; -import { ProjectorCountdown } from 'src/app/domain/models/projector/projector-countdown'; -import { ProjectionDialogService } from 'src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service'; -import { ViewProjector, ViewProjectorCountdown } from 'src/app/site/pages/meetings/pages/projectors'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { DurationService } from 'src/app/site/services/duration.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { ProjectorCountdownDialogService } from '../../../../components/projector-countdown-dialog/services/projector-countdown-dialog.service'; import { ProjectorCountdownControllerService } from '../../services/projector-countdown-controller.service'; @@ -14,6 +14,7 @@ import { ProjectorCountdownControllerService } from '../../services/projector-co selector: `os-countdown-controls`, templateUrl: `./countdown-controls.component.html`, styleUrls: [`./countdown-controls.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CountdownControlsComponent { diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/message-controls/message-controls.component.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/message-controls/message-controls.component.ts index 9445b4924f..0ef4029be9 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/message-controls/message-controls.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/message-controls/message-controls.component.ts @@ -1,8 +1,8 @@ -import { Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { ProjectionDialogService } from '@app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service'; +import { ViewProjector, ViewProjectorMessage } from '@app/site/pages/meetings/pages/projectors'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; -import { ProjectionDialogService } from 'src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service'; -import { ViewProjector, ViewProjectorMessage } from 'src/app/site/pages/meetings/pages/projectors'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { ProjectorMessageDialogService } from '../../../../components/projector-message-dialog/services/projector-message-dialog.service'; import { ProjectorMessageControllerService } from '../../services/projector-message-controller.service'; @@ -11,6 +11,7 @@ import { ProjectorMessageControllerService } from '../../services/projector-mess selector: `os-message-controls`, templateUrl: `./message-controls.component.html`, styleUrls: [`./message-controls.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class MessageControlsComponent { diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/presentation-controls/presentation-controls.component.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/presentation-controls/presentation-controls.component.ts index 8d82fb6669..ebff7d9295 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/presentation-controls/presentation-controls.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/presentation-controls/presentation-controls.component.ts @@ -1,7 +1,7 @@ -import { Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { ViewMediafile, ViewMeetingMediafile } from '@app/site/pages/meetings/pages/mediafiles'; +import { ViewProjection, ViewProjector } from '@app/site/pages/meetings/pages/projectors'; import { combineLatest, map, merge, mergeMap, Observable, of } from 'rxjs'; -import { ViewMediafile, ViewMeetingMediafile } from 'src/app/site/pages/meetings/pages/mediafiles'; -import { ViewProjection, ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; import { ProjectionControllerService } from '../../services/projection-controller.service'; @@ -9,6 +9,7 @@ import { ProjectionControllerService } from '../../services/projection-controlle selector: `os-presentation-controls`, templateUrl: `./presentation-controls.component.html`, styleUrls: [`./presentation-controls.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class PresentationControlsComponent { diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/projector-detail/projector-detail.component.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/projector-detail/projector-detail.component.ts index ca34852a2e..5028498f66 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/projector-detail/projector-detail.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/components/projector-detail/projector-detail.component.ts @@ -1,23 +1,23 @@ import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { MeetingProjectionType } from '@app/gateways/repositories/meeting-repository.service'; +import { ScrollScaleDirection } from '@app/gateways/repositories/projectors/projector.action'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewProjection } from '@app/site/pages/meetings/pages/projectors'; +import { ProjectorControllerService } from '@app/site/pages/meetings/pages/projectors/services/projector-controller.service'; +import { MeetingCollectionMapperService } from '@app/site/pages/meetings/services/meeting-collection-mapper.service'; +import { Projectable, ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models'; +import { DurationService } from '@app/site/services/duration.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { GridTileDimension } from '@app/ui/modules/grid'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, combineLatest, Observable, switchMap } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { MeetingProjectionType } from 'src/app/gateways/repositories/meeting-repository.service'; -import { ScrollScaleDirection } from 'src/app/gateways/repositories/projectors/projector.action'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewProjection } from 'src/app/site/pages/meetings/pages/projectors'; -import { ProjectorControllerService } from 'src/app/site/pages/meetings/pages/projectors/services/projector-controller.service'; -import { MeetingCollectionMapperService } from 'src/app/site/pages/meetings/services/meeting-collection-mapper.service'; -import { Projectable, ProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models'; -import { DurationService } from 'src/app/site/services/duration.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { GridTileDimension } from 'src/app/ui/modules/grid'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { hasListOfSpeakers, ViewListOfSpeakers } from '../../../../../agenda'; import { CurrentListOfSpeakersSlideService } from '../../../../../agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service'; @@ -39,6 +39,7 @@ import { ProjectorMessageControllerService } from '../../services/projector-mess selector: `os-projector-detail`, templateUrl: `./projector-detail.component.html`, styleUrls: [`./projector-detail.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ProjectorDetailComponent extends BaseMeetingComponent implements OnInit { diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/projector-detail.module.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/projector-detail.module.ts index 2c210e28ef..791a01a232 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/projector-detail.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/projector-detail.module.ts @@ -8,12 +8,12 @@ import { MatIconModule } from '@angular/material/icon'; import { MatListModule } from '@angular/material/list'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MeetingsComponentCollectorModule } from 'src/app/site/pages/meetings/modules/meetings-component-collector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { GridModule } from 'src/app/ui/modules/grid'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MeetingsComponentCollectorModule } from '@app/site/pages/meetings/modules/meetings-component-collector'; +import { DirectivesModule } from '@app/ui/directives'; +import { GridModule } from '@app/ui/modules/grid'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; import { ProjectionDialogModule } from '../../../../modules/meetings-component-collector/projection-dialog/projection-dialog.module'; import { ProjectorComponent } from '../../../../modules/projector/components/projector/projector.component'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/current-speaker-chyron-slide.service/current-speaker-chyron-slide.service.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/current-speaker-chyron-slide.service/current-speaker-chyron-slide.service.ts index 84eefb97e4..cd59fcc16e 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/current-speaker-chyron-slide.service/current-speaker-chyron-slide.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/current-speaker-chyron-slide.service/current-speaker-chyron-slide.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; +import { PROJECTIONDEFAULT } from '@app/domain/models/projector/projection-default'; +import { MeetingProjectionType } from '@app/gateways/repositories/meeting-repository.service'; +import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; +import { ProjectorControllerService } from '@app/site/pages/meetings/pages/projectors/services/projector-controller.service'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; -import { PROJECTIONDEFAULT } from 'src/app/domain/models/projector/projection-default'; -import { MeetingProjectionType } from 'src/app/gateways/repositories/meeting-repository.service'; -import { ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; -import { ProjectorControllerService } from 'src/app/site/pages/meetings/pages/projectors/services/projector-controller.service'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { ProjectionBuildDescriptor } from 'src/app/site/pages/meetings/view-models'; @Injectable({ providedIn: 'root' }) export class CurrentSpeakerChyronSlideService { diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projection-controller.service/projection-controller.service.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projection-controller.service/projection-controller.service.ts index 39c95ceceb..5c0e0b0f77 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projection-controller.service/projection-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projection-controller.service/projection-controller.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Projection } from 'src/app/domain/models/projector/projection'; -import { ProjectionRepositoryService } from 'src/app/gateways/repositories/projections/projection-repository.service'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { ViewProjection } from 'src/app/site/pages/meetings/pages/projectors'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { Identifiable } from '@app/domain/interfaces'; +import { Projection } from '@app/domain/models/projector/projection'; +import { ProjectionRepositoryService } from '@app/gateways/repositories/projections/projection-repository.service'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { ViewProjection } from '@app/site/pages/meetings/pages/projectors'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; @Injectable({ providedIn: 'root' }) export class ProjectionControllerService extends BaseMeetingControllerService { diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-countdown-controller.service/projector-countdown-controller.service.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-countdown-controller.service/projector-countdown-controller.service.ts index 77958e0e8f..745572b32d 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-countdown-controller.service/projector-countdown-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-countdown-controller.service/projector-countdown-controller.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ProjectorCountdown } from 'src/app/domain/models/projector/projector-countdown'; -import { ProjectorCountdownRepositoryService } from 'src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { ViewProjectorCountdown } from 'src/app/site/pages/meetings/pages/projectors'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { Identifiable } from '@app/domain/interfaces'; +import { ProjectorCountdown } from '@app/domain/models/projector/projector-countdown'; +import { ProjectorCountdownRepositoryService } from '@app/gateways/repositories/projector-countdowns/projector-countdown-repository.service'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { ViewProjectorCountdown } from '@app/site/pages/meetings/pages/projectors'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; @Injectable({ providedIn: 'root' }) export class ProjectorCountdownControllerService extends BaseMeetingControllerService< diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-message-controller.service/projector-message-controller.service.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-message-controller.service/projector-message-controller.service.ts index 5bc4bb3a55..336c4bc12d 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-message-controller.service/projector-message-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-message-controller.service/projector-message-controller.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ProjectorMessage } from 'src/app/domain/models/projector/projector-message'; -import { ProjectorMessageRepositoryService } from 'src/app/gateways/repositories/projector-messages/projector-message-repository.service'; -import { BaseMeetingControllerService } from 'src/app/site/pages/meetings/base/base-meeting-controller.service'; -import { ViewProjectorMessage } from 'src/app/site/pages/meetings/pages/projectors'; -import { MeetingControllerServiceCollectorService } from 'src/app/site/pages/meetings/services/meeting-controller-service-collector.service'; +import { Identifiable } from '@app/domain/interfaces'; +import { ProjectorMessage } from '@app/domain/models/projector/projector-message'; +import { ProjectorMessageRepositoryService } from '@app/gateways/repositories/projector-messages/projector-message-repository.service'; +import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; +import { ViewProjectorMessage } from '@app/site/pages/meetings/pages/projectors'; +import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; @Injectable({ providedIn: 'root' }) export class ProjectorMessageControllerService extends BaseMeetingControllerService< diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/components/projector-list-entry/projector-list-entry.component.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/components/projector-list-entry/projector-list-entry.component.ts index 6baad36d17..3522402b3d 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/components/projector-list-entry/projector-list-entry.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/components/projector-list-entry/projector-list-entry.component.ts @@ -1,14 +1,14 @@ -import { Component, Input, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Permission } from '@app/domain/definitions/permission'; +import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; +import { ProjectorControllerService } from '@app/site/pages/meetings/pages/projectors/services/projector-controller.service'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; -import { ProjectorControllerService } from 'src/app/site/pages/meetings/pages/projectors/services/projector-controller.service'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { ProjectorEditDialogService } from '../../../../components/projector-edit-dialog/services/projector-edit-dialog.service'; @@ -17,6 +17,7 @@ import { ProjectorEditDialogService } from '../../../../components/projector-edi templateUrl: `./projector-list-entry.component.html`, styleUrls: [`./projector-list-entry.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ProjectorListEntryComponent { diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/components/projector-list/projector-list.component.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/components/projector-list/projector-list.component.ts index 38252ff262..ed6e984244 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/components/projector-list/projector-list.component.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/components/projector-list/projector-list.component.ts @@ -10,16 +10,16 @@ import { } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; +import { Permission } from '@app/domain/definitions/permission'; +import { Projector } from '@app/domain/models/projector/projector'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseMeetingComponent } from '@app/site/pages/meetings/base/base-meeting.component'; +import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; +import { ProjectorControllerService } from '@app/site/pages/meetings/pages/projectors/services/projector-controller.service'; +import { OpenSlidesStatusService } from '@app/site/services/openslides-status.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { TranslateService } from '@ngx-translate/core'; import { Observable, timer } from 'rxjs'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { Projector } from 'src/app/domain/models/projector/projector'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseMeetingComponent } from 'src/app/site/pages/meetings/base/base-meeting.component'; -import { ViewProjector } from 'src/app/site/pages/meetings/pages/projectors'; -import { ProjectorControllerService } from 'src/app/site/pages/meetings/pages/projectors/services/projector-controller.service'; -import { OpenSlidesStatusService } from 'src/app/site/services/openslides-status.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; @Component({ selector: `os-projector-list`, diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/projector-list.module.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/projector-list.module.ts index bf51f67268..95301a7d66 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/projector-list.module.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-list/projector-list.module.ts @@ -7,11 +7,11 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ActionCardComponent } from 'src/app/ui/modules/action-card'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { ActionCardComponent } from '@app/ui/modules/action-card'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; import { ProjectorComponent } from '../../../../modules/projector/components/projector/projector.component'; import { ProjectorModule } from '../../../../modules/projector/projector.module'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/projector.config.ts b/client/src/app/site/pages/meetings/pages/projectors/projector.config.ts index d436454ef8..53d0a73b24 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/projector.config.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/projector.config.ts @@ -1,13 +1,13 @@ -import { Permission } from 'src/app/domain/definitions/permission'; -import { Projection } from 'src/app/domain/models/projector/projection'; -import { Projector } from 'src/app/domain/models/projector/projector'; -import { ProjectorCountdown } from 'src/app/domain/models/projector/projector-countdown'; -import { ProjectorMessage } from 'src/app/domain/models/projector/projector-message'; -import { ProjectionRepositoryService } from 'src/app/gateways/repositories/projections/projection-repository.service'; -import { ProjectorCountdownRepositoryService } from 'src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service'; -import { ProjectorMessageRepositoryService } from 'src/app/gateways/repositories/projector-messages/projector-message-repository.service'; -import { ProjectorRepositoryService } from 'src/app/gateways/repositories/projectors/projector-repository.service'; -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; +import { Permission } from '@app/domain/definitions/permission'; +import { Projection } from '@app/domain/models/projector/projection'; +import { Projector } from '@app/domain/models/projector/projector'; +import { ProjectorCountdown } from '@app/domain/models/projector/projector-countdown'; +import { ProjectorMessage } from '@app/domain/models/projector/projector-message'; +import { ProjectionRepositoryService } from '@app/gateways/repositories/projections/projection-repository.service'; +import { ProjectorCountdownRepositoryService } from '@app/gateways/repositories/projector-countdowns/projector-countdown-repository.service'; +import { ProjectorMessageRepositoryService } from '@app/gateways/repositories/projector-messages/projector-message-repository.service'; +import { ProjectorRepositoryService } from '@app/gateways/repositories/projectors/projector-repository.service'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; import { ViewProjection, ViewProjector, ViewProjectorCountdown, ViewProjectorMessage } from './view-models'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts b/client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts index c887db52a9..9b9b27707f 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/projectors.subscription.ts @@ -1,9 +1,9 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { FULL_FIELDSET } from 'src/app/domain/fieldsets/misc'; -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; -import { MEETING_DEFAULT_PROJECTOR_IDS_KEYS } from 'src/app/domain/models/meetings/meeting.constants'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { DEFAULT_FIELDSET } from 'src/app/site/services/model-request-builder'; +import { Id } from '@app/domain/definitions/key-types'; +import { FULL_FIELDSET } from '@app/domain/fieldsets/misc'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; +import { MEETING_DEFAULT_PROJECTOR_IDS_KEYS } from '@app/domain/models/meetings/meeting.constants'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { DEFAULT_FIELDSET } from '@app/site/services/model-request-builder'; import { ViewProjector } from './view-models'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/services/projector-controller.service.ts b/client/src/app/site/pages/meetings/pages/projectors/services/projector-controller.service.ts index 3237cbce05..fc5d854173 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/services/projector-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/services/projector-controller.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; +import { Ids } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { PROJECTIONDEFAULTS } from '@app/domain/models/projector/projection-default'; +import { Projector } from '@app/domain/models/projector/projector'; +import { Action } from '@app/gateways/actions'; +import { MeetingRepositoryService } from '@app/gateways/repositories/meeting-repository.service'; +import { ScrollScaleDirection } from '@app/gateways/repositories/projectors/projector.action'; +import { ProjectorRepositoryService } from '@app/gateways/repositories/projectors/projector-repository.service'; import { Observable } from 'rxjs'; -import { Ids } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { PROJECTIONDEFAULTS } from 'src/app/domain/models/projector/projection-default'; -import { Projector } from 'src/app/domain/models/projector/projector'; -import { Action } from 'src/app/gateways/actions'; -import { MeetingRepositoryService } from 'src/app/gateways/repositories/meeting-repository.service'; -import { ScrollScaleDirection } from 'src/app/gateways/repositories/projectors/projector.action'; -import { ProjectorRepositoryService } from 'src/app/gateways/repositories/projectors/projector-repository.service'; import { BaseMeetingControllerService } from '../../../base/base-meeting-controller.service'; import { MeetingControllerServiceCollectorService } from '../../../services/meeting-controller-service-collector.service'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/view-models/view-projection.ts b/client/src/app/site/pages/meetings/pages/projectors/view-models/view-projection.ts index 2e436fe6ee..2f5d440d53 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/view-models/view-projection.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/view-models/view-projection.ts @@ -1,4 +1,4 @@ -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; import { HasProjectorTitle, ProjectorTitle } from '../../../../../../domain/interfaces/has-projector-title'; import { Projection } from '../../../../../../domain/models/projector/projection'; diff --git a/client/src/app/site/pages/meetings/pages/projectors/view-models/view-projector-countdown.ts b/client/src/app/site/pages/meetings/pages/projectors/view-models/view-projector-countdown.ts index 5ea7434c94..f92a73c51e 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/view-models/view-projector-countdown.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/view-models/view-projector-countdown.ts @@ -1,5 +1,5 @@ +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; import { _ } from '@ngx-translate/core'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; import { PROJECTIONDEFAULT, diff --git a/client/src/app/site/pages/meetings/pages/projectors/view-models/view-projector.ts b/client/src/app/site/pages/meetings/pages/projectors/view-models/view-projector.ts index ca02135662..a3a022b5b9 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/view-models/view-projector.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/view-models/view-projector.ts @@ -1,11 +1,11 @@ -import { HasProperties } from 'src/app/domain/interfaces/has-properties'; -import { ProjectiondefaultValue } from 'src/app/domain/models/projector/projection-default'; -import { Projector } from 'src/app/domain/models/projector/projector'; -import { ViewProjectorMeetingUsageKey } from 'src/app/domain/models/projector/projector.constants'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { HasMeeting } from 'src/app/site/pages/meetings/view-models/has-meeting'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { Follow } from 'src/app/site/services/model-request-builder'; +import { HasProperties } from '@app/domain/interfaces/has-properties'; +import { ProjectiondefaultValue } from '@app/domain/models/projector/projection-default'; +import { Projector } from '@app/domain/models/projector/projector'; +import { ViewProjectorMeetingUsageKey } from '@app/domain/models/projector/projector.constants'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; +import { HasMeeting } from '@app/site/pages/meetings/view-models/has-meeting'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { Follow } from '@app/site/services/model-request-builder'; import { ViewProjection } from './view-projection'; diff --git a/client/src/app/site/pages/meetings/pages/settings/settings.config.ts b/client/src/app/site/pages/meetings/pages/settings/settings.config.ts index 824fa8fa99..5366a29e75 100644 --- a/client/src/app/site/pages/meetings/pages/settings/settings.config.ts +++ b/client/src/app/site/pages/meetings/pages/settings/settings.config.ts @@ -1,5 +1,5 @@ -import { Permission } from 'src/app/domain/definitions/permission'; -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; +import { Permission } from '@app/domain/definitions/permission'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; export const SettingsAppConfig: AppConfig = { name: `settings`, diff --git a/client/src/app/site/pages/meetings/services/active-meeting-id.service.ts b/client/src/app/site/pages/meetings/services/active-meeting-id.service.ts index 88ef8e11a2..35b213a623 100644 --- a/client/src/app/site/pages/meetings/services/active-meeting-id.service.ts +++ b/client/src/app/site/pages/meetings/services/active-meeting-id.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Router, RoutesRecognized } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; import { BehaviorSubject, distinctUntilChanged, filter, map, Observable, Subject } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; import { MeetingDataStoreService } from './meeting-data-store.service'; diff --git a/client/src/app/site/pages/meetings/services/active-meeting.service.ts b/client/src/app/site/pages/meetings/services/active-meeting.service.ts index 4bfb217e6a..6983273697 100644 --- a/client/src/app/site/pages/meetings/services/active-meeting.service.ts +++ b/client/src/app/site/pages/meetings/services/active-meeting.service.ts @@ -1,11 +1,11 @@ import { inject, Injectable } from '@angular/core'; import { Router } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { BannerDefinition, BannerService } from '@app/site/modules/site-wrapper/services/banner.service'; +import { AuthService } from '@app/site/services/auth.service'; +import { ModelRequestService } from '@app/site/services/model-request.service'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, first, firstValueFrom, map, Observable, Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { BannerDefinition, BannerService } from 'src/app/site/modules/site-wrapper/services/banner.service'; -import { AuthService } from 'src/app/site/services/auth.service'; -import { ModelRequestService } from 'src/app/site/services/model-request.service'; import { LifecycleService } from '../../../services/lifecycle.service'; import { ViewMeeting } from '../view-models/view-meeting'; diff --git a/client/src/app/site/pages/meetings/services/active-meeting.subscription.ts b/client/src/app/site/pages/meetings/services/active-meeting.subscription.ts index ebbf4c3699..0199b0b4ed 100644 --- a/client/src/app/site/pages/meetings/services/active-meeting.subscription.ts +++ b/client/src/app/site/pages/meetings/services/active-meeting.subscription.ts @@ -1,9 +1,7 @@ -import 'src/app/site/services/model-request-builder'; - -import { Id } from 'src/app/domain/definitions/key-types'; -import { FULL_FIELDSET, MEETING_ROUTING_FIELDS } from 'src/app/domain/fieldsets/misc'; -import { UserFieldsets } from 'src/app/domain/fieldsets/user'; -import { MEETING_MEDIAFILE_USAGE_ID_KEYS } from 'src/app/domain/models/meetings/meeting.constants'; +import { Id } from '@app/domain/definitions/key-types'; +import { FULL_FIELDSET, MEETING_ROUTING_FIELDS } from '@app/domain/fieldsets/misc'; +import { UserFieldsets } from '@app/domain/fieldsets/user'; +import { MEETING_MEDIAFILE_USAGE_ID_KEYS } from '@app/domain/models/meetings/meeting.constants'; import { ViewMeeting } from '../view-models/view-meeting'; diff --git a/client/src/app/site/pages/meetings/services/active-polls.service.ts b/client/src/app/site/pages/meetings/services/active-polls.service.ts index 7d2e76a84d..f8a02d75fe 100644 --- a/client/src/app/site/pages/meetings/services/active-polls.service.ts +++ b/client/src/app/site/pages/meetings/services/active-polls.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { viewModelListEqual } from '@app/infrastructure/utils'; +import { ModelRequestService } from '@app/site/services/model-request.service'; import { BehaviorSubject, distinctUntilChanged, map, Observable, Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { viewModelListEqual } from 'src/app/infrastructure/utils'; -import { ModelRequestService } from 'src/app/site/services/model-request.service'; import { PollControllerService } from '../modules/poll/services/poll-controller.service'; import { ViewPoll } from '../pages/polls'; diff --git a/client/src/app/site/pages/meetings/services/active-polls.subscription.ts b/client/src/app/site/pages/meetings/services/active-polls.subscription.ts index 9ede9cdddd..b4564fd478 100644 --- a/client/src/app/site/pages/meetings/services/active-polls.subscription.ts +++ b/client/src/app/site/pages/meetings/services/active-polls.subscription.ts @@ -1,6 +1,6 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; -import { DEFAULT_FIELDSET } from 'src/app/site/services/model-request-builder'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; +import { DEFAULT_FIELDSET } from '@app/site/services/model-request-builder'; import { ViewPoll } from '../pages/polls'; import { pollModelRequest } from '../pages/polls/polls.subscription'; diff --git a/client/src/app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service.ts b/client/src/app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service.ts index d753ca3d1a..b1a3344b02 100644 --- a/client/src/app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service.ts +++ b/client/src/app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service.ts @@ -4,9 +4,9 @@ import { DEFAULT_COLUMN_SEPARATOR, DEFAULT_ENCODING, DEFAULT_LINE_SEPARATOR -} from 'src/app/gateways/export/csv-export.service'; -import { CsvExportForBackendService } from 'src/app/gateways/export/csv-export.service/csv-export-for-backend.service'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; +} from '@app/gateways/export/csv-export.service'; +import { CsvExportForBackendService } from '@app/gateways/export/csv-export.service/csv-export-for-backend.service'; +import { BaseViewModel } from '@app/site/base/base-view-model'; import { MeetingSettingsService } from '../meeting-settings.service'; diff --git a/client/src/app/site/pages/meetings/services/export/meeting-csv-export.service.ts b/client/src/app/site/pages/meetings/services/export/meeting-csv-export.service.ts index 7d5fdeca22..30f0b5d829 100644 --- a/client/src/app/site/pages/meetings/services/export/meeting-csv-export.service.ts +++ b/client/src/app/site/pages/meetings/services/export/meeting-csv-export.service.ts @@ -5,8 +5,8 @@ import { DEFAULT_COLUMN_SEPARATOR, DEFAULT_ENCODING, DEFAULT_LINE_SEPARATOR -} from 'src/app/gateways/export/csv-export.service'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; +} from '@app/gateways/export/csv-export.service'; +import { BaseViewModel } from '@app/site/base/base-view-model'; import { MeetingSettingsService } from '../meeting-settings.service'; diff --git a/client/src/app/site/pages/meetings/services/export/meeting-export.module.ts b/client/src/app/site/pages/meetings/services/export/meeting-export.module.ts index cbc044b10e..bd4dc8be17 100644 --- a/client/src/app/site/pages/meetings/services/export/meeting-export.module.ts +++ b/client/src/app/site/pages/meetings/services/export/meeting-export.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { ExportServiceModule } from 'src/app/gateways/export'; +import { ExportServiceModule } from '@app/gateways/export'; @NgModule({ imports: [ExportServiceModule] }) export class MeetingExportModule {} diff --git a/client/src/app/site/pages/meetings/services/export/meeting-pdf-export.service.ts b/client/src/app/site/pages/meetings/services/export/meeting-pdf-export.service.ts index efad57dad8..2fae022916 100644 --- a/client/src/app/site/pages/meetings/services/export/meeting-pdf-export.service.ts +++ b/client/src/app/site/pages/meetings/services/export/meeting-pdf-export.service.ts @@ -1,17 +1,17 @@ import { Injectable } from '@angular/core'; -import { Content, ContentText, PageSize, TDocumentDefinitions } from 'pdfmake/interfaces'; -import { FontPlace } from 'src/app/domain/models/mediafiles/mediafile.constants'; +import { FontPlace } from '@app/domain/models/mediafiles/mediafile.constants'; import { PdfDocumentService, PdfFontDescription, PdfVirtualFileSystem, TocLineDefinition, TocTableDefinition -} from 'src/app/gateways/export/pdf-document.service'; -import { HttpService } from 'src/app/gateways/http.service'; -import { mmToPoints } from 'src/app/infrastructure/utils'; -import { MediaManageService } from 'src/app/site/pages/meetings/services/media-manage.service'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; +} from '@app/gateways/export/pdf-document.service'; +import { HttpService } from '@app/gateways/http.service'; +import { mmToPoints } from '@app/infrastructure/utils'; +import { MediaManageService } from '@app/site/pages/meetings/services/media-manage.service'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { Content, ContentText, PageSize, TDocumentDefinitions } from 'pdfmake/interfaces'; interface MeetingDownloadLandscapeConfig { docDefinition: Content; diff --git a/client/src/app/site/pages/meetings/services/media-manage.service.ts b/client/src/app/site/pages/meetings/services/media-manage.service.ts index b3c37ae763..d453145893 100644 --- a/client/src/app/site/pages/meetings/services/media-manage.service.ts +++ b/client/src/app/site/pages/meetings/services/media-manage.service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject, distinctUntilChanged, merge, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; import { FONT_PLACES, FontDefaults, @@ -9,10 +8,11 @@ import { LOGO_PLACES, LogoDisplayNames, LogoPlace -} from 'src/app/domain/models/mediafiles/mediafile.constants'; -import { MeetingMediaAdapterService } from 'src/app/gateways/meeting-media-adapter.service'; -import { MediafileRepositoryService } from 'src/app/gateways/repositories/mediafiles/mediafile-repository.service'; -import { MeetingMediafileRepositoryService } from 'src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service'; +} from '@app/domain/models/mediafiles/mediafile.constants'; +import { MeetingMediaAdapterService } from '@app/gateways/meeting-media-adapter.service'; +import { MediafileRepositoryService } from '@app/gateways/repositories/mediafiles/mediafile-repository.service'; +import { MeetingMediafileRepositoryService } from '@app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service'; +import { BehaviorSubject, distinctUntilChanged, merge, Observable } from 'rxjs'; import { ViewMediafile, ViewMeetingMediafile } from '../pages/mediafiles'; import { ActiveMeetingService } from './active-meeting.service'; diff --git a/client/src/app/site/pages/meetings/services/meeting-collection-mapper.service.ts b/client/src/app/site/pages/meetings/services/meeting-collection-mapper.service.ts index c22f4da0a2..8834610e78 100644 --- a/client/src/app/site/pages/meetings/services/meeting-collection-mapper.service.ts +++ b/client/src/app/site/pages/meetings/services/meeting-collection-mapper.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; -import { BehaviorSubject, Observable } from 'rxjs'; -import { Fqid } from 'src/app/domain/definitions/key-types'; -import { BaseMeetingRelatedRepository } from 'src/app/gateways/repositories/base-meeting-related-repository'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; +import { Fqid } from '@app/domain/definitions/key-types'; +import { BaseMeetingRelatedRepository } from '@app/gateways/repositories/base-meeting-related-repository'; +import { BaseViewModel } from '@app/site/base/base-view-model'; import { CollectionMappedTypes, CollectionMapperService, CollectionType -} from 'src/app/site/services/collection-mapper.service'; -import { CollectionMapper } from 'src/app/site/services/collection-mapper.service/collection-mapper'; +} from '@app/site/services/collection-mapper.service'; +import { CollectionMapper } from '@app/site/services/collection-mapper.service/collection-mapper'; +import { BehaviorSubject, Observable } from 'rxjs'; @Injectable({ providedIn: `root` diff --git a/client/src/app/site/pages/meetings/services/meeting-controller-service-collector.service.ts b/client/src/app/site/pages/meetings/services/meeting-controller-service-collector.service.ts index dcd4510ba0..abfb110737 100644 --- a/client/src/app/site/pages/meetings/services/meeting-controller-service-collector.service.ts +++ b/client/src/app/site/pages/meetings/services/meeting-controller-service-collector.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; +import { ControllerServiceCollectorService } from '@app/site/services/controller-service-collector.service'; +import { DataStoreService } from '@app/site/services/data-store.service'; +import { RelationManagerService } from '@app/site/services/relation-manager.service'; +import { ViewModelStoreService } from '@app/site/services/view-model-store.service'; import { TranslateService } from '@ngx-translate/core'; -import { ControllerServiceCollectorService } from 'src/app/site/services/controller-service-collector.service'; -import { DataStoreService } from 'src/app/site/services/data-store.service'; -import { RelationManagerService } from 'src/app/site/services/relation-manager.service'; -import { ViewModelStoreService } from 'src/app/site/services/view-model-store.service'; import { ActiveMeetingService } from './active-meeting.service'; import { ActiveMeetingIdService } from './active-meeting-id.service'; diff --git a/client/src/app/site/pages/meetings/services/meeting-controller.service.ts b/client/src/app/site/pages/meetings/services/meeting-controller.service.ts index ff79e7d9ae..943b843adf 100644 --- a/client/src/app/site/pages/meetings/services/meeting-controller.service.ts +++ b/client/src/app/site/pages/meetings/services/meeting-controller.service.ts @@ -1,10 +1,10 @@ import { Injectable, Injector } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Action } from '@app/gateways/actions'; +import { ImportMeeting } from '@app/gateways/repositories/meeting-repository.service'; +import { PointOfOrderCategoryRepositoryService } from '@app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service'; +import { BaseController } from '@app/site/base/base-controller'; import { Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Action } from 'src/app/gateways/actions'; -import { ImportMeeting } from 'src/app/gateways/repositories/meeting-repository.service'; -import { PointOfOrderCategoryRepositoryService } from 'src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service'; -import { BaseController } from 'src/app/site/base/base-controller'; import { Identifiable } from '../../../../domain/interfaces'; import { Meeting } from '../../../../domain/models/meetings/meeting'; diff --git a/client/src/app/site/pages/meetings/services/meeting-data-store.service.ts b/client/src/app/site/pages/meetings/services/meeting-data-store.service.ts index 830e27b292..aafc04d4b4 100644 --- a/client/src/app/site/pages/meetings/services/meeting-data-store.service.ts +++ b/client/src/app/site/pages/meetings/services/meeting-data-store.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { DataStoreService } from 'src/app/site/services/data-store.service'; +import { DataStoreService } from '@app/site/services/data-store.service'; import { MeetingCollectionMapperService } from './meeting-collection-mapper.service'; diff --git a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.spec.ts b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.spec.ts index 5eadef335d..032ec7a7fe 100644 --- a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.spec.ts +++ b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; -import { meetingSettingsDefaults } from 'src/app/domain/definitions/meeting-settings-defaults'; -import { Settings } from 'src/app/domain/models/meetings/meeting'; -import { Group } from 'src/app/domain/models/users/group'; +import { meetingSettingsDefaults } from '@app/domain/definitions/meeting-settings-defaults'; +import { Settings } from '@app/domain/models/meetings/meeting'; +import { Group } from '@app/domain/models/users/group'; import { MeetingSettingsDefinitionService, SettingsMap } from './meeting-settings-definition.service'; import { diff --git a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.ts b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.ts index 723d04990c..c42f37a2c0 100644 --- a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.ts +++ b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Settings } from 'src/app/domain/models/meetings/meeting'; +import { Settings } from '@app/domain/models/meetings/meeting'; import { meetingSettingsDefaults } from '../../../../../domain/definitions/meeting-settings-defaults'; import { isSettingsInput, meetingSettings, SettingsGroup, SettingsInput } from './meeting-settings-definitions'; diff --git a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts index a85410bfbf..c1fe7399d2 100644 --- a/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts +++ b/client/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts @@ -1,15 +1,15 @@ import { ValidatorFn, Validators } from '@angular/forms'; -import { _ } from '@ngx-translate/core'; -import { AgendaItemType } from 'src/app/domain/models/agenda/agenda-item'; -import { Settings } from 'src/app/domain/models/meetings/meeting'; -import { MotionWorkflow } from 'src/app/domain/models/motions/motion-workflow'; +import { AgendaItemType } from '@app/domain/models/agenda/agenda-item'; +import { Settings } from '@app/domain/models/meetings/meeting'; +import { MotionWorkflow } from '@app/domain/models/motions/motion-workflow'; import { PollBackendDurationChoices, PollPercentBaseVerbose, PollTypeVerbose -} from 'src/app/domain/models/poll/poll-constants'; -import { ObjectReplaceKeysConfig } from 'src/app/infrastructure/utils'; -import { createEmailValidator } from 'src/app/infrastructure/utils/validators/email'; +} from '@app/domain/models/poll/poll-constants'; +import { ObjectReplaceKeysConfig } from '@app/infrastructure/utils'; +import { createEmailValidator } from '@app/infrastructure/utils/validators/email'; +import { _ } from '@ngx-translate/core'; import { OrganizationSettingsService } from '../../../organization/services/organization-settings.service'; import { AssignmentPollMethodVerbose } from '../../pages/assignments/modules/assignment-poll/definitions'; diff --git a/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.ts b/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.ts index 666eb51039..a24c6d3e95 100644 --- a/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.ts +++ b/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.ts @@ -1,15 +1,15 @@ import { inject, Injectable } from '@angular/core'; +import { Collection, Id } from '@app/domain/definitions/key-types'; +import { HasMeetingId, HasSequentialNumber, isSequentialNumberHaving } from '@app/domain/interfaces'; +import { Assignment } from '@app/domain/models/assignments/assignment'; +import { ListOfSpeakers } from '@app/domain/models/list-of-speakers/list-of-speakers'; +import { Topic } from '@app/domain/models/topics/topic'; +import { BaseMeetingRelatedRepository } from '@app/gateways/repositories/base-meeting-related-repository'; +import { Mutex } from '@app/infrastructure/utils/promises'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { AutoupdateService } from '@app/site/services/autoupdate'; +import { ModelRequestBuilderService, SimplifiedModelRequest } from '@app/site/services/model-request-builder'; import { Subscription } from 'rxjs'; -import { Collection, Id } from 'src/app/domain/definitions/key-types'; -import { HasMeetingId, HasSequentialNumber, isSequentialNumberHaving } from 'src/app/domain/interfaces'; -import { Assignment } from 'src/app/domain/models/assignments/assignment'; -import { ListOfSpeakers } from 'src/app/domain/models/list-of-speakers/list-of-speakers'; -import { Topic } from 'src/app/domain/models/topics/topic'; -import { BaseMeetingRelatedRepository } from 'src/app/gateways/repositories/base-meeting-related-repository'; -import { Mutex } from 'src/app/infrastructure/utils/promises'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { AutoupdateService } from 'src/app/site/services/autoupdate'; -import { ModelRequestBuilderService, SimplifiedModelRequest } from 'src/app/site/services/model-request-builder'; import { ViewMotion, ViewMotionBlock, ViewMotionCategory, ViewMotionWorkflow } from '../pages/motions'; import { ViewPoll } from '../pages/polls'; diff --git a/client/src/app/site/pages/meetings/view-models/has-meeting.ts b/client/src/app/site/pages/meetings/view-models/has-meeting.ts index d8d54b8145..8d7af654ea 100644 --- a/client/src/app/site/pages/meetings/view-models/has-meeting.ts +++ b/client/src/app/site/pages/meetings/view-models/has-meeting.ts @@ -1,4 +1,4 @@ -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; import { ViewMeeting } from './view-meeting'; diff --git a/client/src/app/site/pages/meetings/view-models/view-meeting-user.ts b/client/src/app/site/pages/meetings/view-models/view-meeting-user.ts index 351cd9776d..41ee9260f1 100644 --- a/client/src/app/site/pages/meetings/view-models/view-meeting-user.ts +++ b/client/src/app/site/pages/meetings/view-models/view-meeting-user.ts @@ -1,6 +1,6 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { MeetingUser } from 'src/app/domain/models/meeting-users/meeting-user'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { Id } from '@app/domain/definitions/key-types'; +import { MeetingUser } from '@app/domain/models/meeting-users/meeting-user'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; import { ViewSpeaker } from '../pages/agenda'; import { ViewAssignmentCandidate } from '../pages/assignments'; diff --git a/client/src/app/site/pages/meetings/view-models/view-meeting.ts b/client/src/app/site/pages/meetings/view-models/view-meeting.ts index c5211298bb..7ee7192167 100644 --- a/client/src/app/site/pages/meetings/view-models/view-meeting.ts +++ b/client/src/app/site/pages/meetings/view-models/view-meeting.ts @@ -1,15 +1,15 @@ -import { endOfDay, fromUnixTime, startOfDay } from 'date-fns'; -import { HasProjectorTitle } from 'src/app/domain/interfaces/has-projector-title'; -import { HasProperties } from 'src/app/domain/interfaces/has-properties'; -import { FONT_PLACES, FontPlace, LOGO_PLACES, LogoPlace } from 'src/app/domain/models/mediafiles/mediafile.constants'; -import { Meeting } from 'src/app/domain/models/meetings/meeting'; +import { HasProjectorTitle } from '@app/domain/interfaces/has-projector-title'; +import { HasProperties } from '@app/domain/interfaces/has-properties'; +import { FONT_PLACES, FontPlace, LOGO_PLACES, LogoPlace } from '@app/domain/models/mediafiles/mediafile.constants'; +import { Meeting } from '@app/domain/models/meetings/meeting'; import { ViewMeetingDefaultProjectorsKey, ViewMeetingMediafileUsageKey -} from 'src/app/domain/models/meetings/meeting.constants'; -import { ProjectiondefaultValue } from 'src/app/domain/models/projector/projection-default'; -import { ViewHistoryEntry } from 'src/app/gateways/repositories/history-entry/view-history-entry'; -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; +} from '@app/domain/models/meetings/meeting.constants'; +import { ProjectiondefaultValue } from '@app/domain/models/projector/projection-default'; +import { ViewHistoryEntry } from '@app/gateways/repositories/history-entry/view-history-entry'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; +import { endOfDay, fromUnixTime, startOfDay } from 'date-fns'; import { ViewCommittee } from '../../organization/pages/committees'; import { HasOrganizationTags } from '../../organization/pages/organization-tags'; diff --git a/client/src/app/site/pages/meetings/view-models/view-user.ts b/client/src/app/site/pages/meetings/view-models/view-user.ts index 304407e3fc..940455c1aa 100644 --- a/client/src/app/site/pages/meetings/view-models/view-user.ts +++ b/client/src/app/site/pages/meetings/view-models/view-user.ts @@ -1,7 +1,7 @@ -import { User } from 'src/app/domain/models/users/user'; -import { HasHistoryEntries } from 'src/app/gateways/repositories/history-entry/has-history-entries'; -import { ViewHistoryPosition } from 'src/app/gateways/repositories/history-position/view-history-position'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { User } from '@app/domain/models/users/user'; +import { HasHistoryEntries } from '@app/gateways/repositories/history-entry/has-history-entries'; +import { ViewHistoryPosition } from '@app/gateways/repositories/history-position/view-history-position'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; import { Id } from '../../../../domain/definitions/key-types'; import { ViewGender } from '../../organization/pages/accounts/pages/gender/view-models/view-gender'; diff --git a/client/src/app/site/pages/organization/modules/account-search-selector/account-search-selector.module.ts b/client/src/app/site/pages/organization/modules/account-search-selector/account-search-selector.module.ts index 1da39e5229..35d99f1d58 100644 --- a/client/src/app/site/pages/organization/modules/account-search-selector/account-search-selector.module.ts +++ b/client/src/app/site/pages/organization/modules/account-search-selector/account-search-selector.module.ts @@ -6,8 +6,8 @@ import { MatChipsModule } from '@angular/material/chips'; import { MatIconModule } from '@angular/material/icon'; import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; import { AccountSearchSelectorComponent } from './components/account-search-selector/account-search-selector.component'; diff --git a/client/src/app/site/pages/organization/modules/account-search-selector/components/account-search-selector/account-search-selector.component.ts b/client/src/app/site/pages/organization/modules/account-search-selector/components/account-search-selector/account-search-selector.component.ts index 4602132b03..bfa83980d4 100644 --- a/client/src/app/site/pages/organization/modules/account-search-selector/components/account-search-selector/account-search-selector.component.ts +++ b/client/src/app/site/pages/organization/modules/account-search-selector/components/account-search-selector/account-search-selector.component.ts @@ -1,18 +1,18 @@ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core'; import { NgControl } from '@angular/forms'; import { MatOptionSelectionChange } from '@angular/material/core'; import { MatFormFieldControl } from '@angular/material/form-field'; +import { CML, OML } from '@app/domain/definitions/organization-permission'; +import { Selectable } from '@app/domain/interfaces/selectable'; +import { User } from '@app/domain/models/users/user'; +import { SearchUsersPresenterService } from '@app/gateways/presenter'; +import { UserRepositoryService } from '@app/gateways/repositories/users'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { UserScope } from '@app/site/services/user.service'; +import { BaseSearchSelectorComponent } from '@app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component'; import { distinctUntilChanged } from 'rxjs'; -import { CML, OML } from 'src/app/domain/definitions/organization-permission'; -import { Selectable } from 'src/app/domain/interfaces/selectable'; -import { User } from 'src/app/domain/models/users/user'; -import { SearchUsersPresenterService } from 'src/app/gateways/presenter'; -import { UserRepositoryService } from 'src/app/gateways/repositories/users'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { UserScope } from 'src/app/site/services/user.service'; -import { BaseSearchSelectorComponent } from 'src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component'; import { AccountSortService } from '../../../../pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service'; @@ -24,6 +24,7 @@ import { AccountSortService } from '../../../../pages/accounts/pages/account-lis `../../../../../../../ui/modules/search-selector/components/base-search-selector/base-search-selector.component.scss` ], providers: [{ provide: MatFormFieldControl, useExisting: AccountSearchSelectorComponent }], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AccountSearchSelectorComponent extends BaseSearchSelectorComponent implements OnInit, OnDestroy { diff --git a/client/src/app/site/pages/organization/modules/navigation/navigation.module.ts b/client/src/app/site/pages/organization/modules/navigation/navigation.module.ts index 1910529d33..9fe6a68565 100644 --- a/client/src/app/site/pages/organization/modules/navigation/navigation.module.ts +++ b/client/src/app/site/pages/organization/modules/navigation/navigation.module.ts @@ -4,10 +4,10 @@ import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { RouterModule } from '@angular/router'; -import { GlobalHeadbarModule } from 'src/app/site/modules/global-headbar'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { SidenavModule } from 'src/app/ui/modules/sidenav/sidenav.module'; +import { GlobalHeadbarModule } from '@app/site/modules/global-headbar'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { SidenavModule } from '@app/ui/modules/sidenav/sidenav.module'; import { OrganizationNavigationComponent } from './organization-navigation/organization-navigation.component'; import { OrganizationNavigationWrapperComponent } from './organization-navigation-wrapper/organization-navigation-wrapper.component'; diff --git a/client/src/app/site/pages/organization/modules/navigation/organization-navigation-wrapper/organization-navigation-wrapper.component.ts b/client/src/app/site/pages/organization/modules/navigation/organization-navigation-wrapper/organization-navigation-wrapper.component.ts index 82a0b44057..6fa16f7744 100644 --- a/client/src/app/site/pages/organization/modules/navigation/organization-navigation-wrapper/organization-navigation-wrapper.component.ts +++ b/client/src/app/site/pages/organization/modules/navigation/organization-navigation-wrapper/organization-navigation-wrapper.component.ts @@ -1,16 +1,17 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core'; import { NavigationEnd } from '@angular/router'; +import { BaseComponent } from '@app/site/base/base.component'; +import { MainMenuEntry, MainMenuService } from '@app/site/pages/meetings/services/main-menu.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { SidenavComponent } from '@app/ui/modules/sidenav/components/sidenav/sidenav.component'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { MainMenuEntry, MainMenuService } from 'src/app/site/pages/meetings/services/main-menu.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { SidenavComponent } from 'src/app/ui/modules/sidenav/components/sidenav/sidenav.component'; @Component({ selector: `os-organization-navigation-wrapper`, templateUrl: `./organization-navigation-wrapper.component.html`, styleUrls: [`./organization-navigation-wrapper.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class OrganizationNavigationWrapperComponent extends BaseComponent implements OnInit { diff --git a/client/src/app/site/pages/organization/modules/navigation/organization-navigation/organization-navigation.component.ts b/client/src/app/site/pages/organization/modules/navigation/organization-navigation/organization-navigation.component.ts index 7f90df272e..052a847b4e 100644 --- a/client/src/app/site/pages/organization/modules/navigation/organization-navigation/organization-navigation.component.ts +++ b/client/src/app/site/pages/organization/modules/navigation/organization-navigation/organization-navigation.component.ts @@ -1,10 +1,10 @@ -import { Component } from '@angular/core'; -import { CML, OML } from 'src/app/domain/definitions/organization-permission'; -import { BaseMenuEntry, getCustomStyleForEntry } from 'src/app/site/base/base-menu-entry'; -import { MainMenuService } from 'src/app/site/pages/meetings/services/main-menu.service'; -import { AuthService } from 'src/app/site/services/auth.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { CML, OML } from '@app/domain/definitions/organization-permission'; +import { BaseMenuEntry, getCustomStyleForEntry } from '@app/site/base/base-menu-entry'; +import { MainMenuService } from '@app/site/pages/meetings/services/main-menu.service'; +import { AuthService } from '@app/site/services/auth.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; interface OrgaMenuEntry extends BaseMenuEntry { optionalCML?: CML; @@ -14,6 +14,7 @@ interface OrgaMenuEntry extends BaseMenuEntry { selector: `os-organization-navigation`, templateUrl: `./organization-navigation.component.html`, styleUrls: [`./organization-navigation.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class OrganizationNavigationComponent { diff --git a/client/src/app/site/pages/organization/organization.config.ts b/client/src/app/site/pages/organization/organization.config.ts index de307ed7ea..fab17610bb 100644 --- a/client/src/app/site/pages/organization/organization.config.ts +++ b/client/src/app/site/pages/organization/organization.config.ts @@ -1,4 +1,4 @@ -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; import { Organization } from '../../../domain/models/organizations/organization'; import { OrganizationRepositoryService } from '../../../gateways/repositories/organization-repository.service'; diff --git a/client/src/app/site/pages/organization/organization.subscription.ts b/client/src/app/site/pages/organization/organization.subscription.ts index 45721d5cb2..4e4597fc17 100644 --- a/client/src/app/site/pages/organization/organization.subscription.ts +++ b/client/src/app/site/pages/organization/organization.subscription.ts @@ -1,11 +1,11 @@ -import { FULL_FIELDSET } from 'src/app/domain/fieldsets/misc'; -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; +import { FULL_FIELDSET } from '@app/domain/fieldsets/misc'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; import { MEETING_CREATE_SUBSCRIPTION, MEETING_LIST_SUBSCRIPTION -} from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization'; +} from '@app/site/pages/meetings/view-models/view-meeting'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { ViewOrganization } from '@app/site/pages/organization/view-models/view-organization'; import { DEFAULT_FIELDSET } from '../../services/model-request-builder'; diff --git a/client/src/app/site/pages/organization/pages/accounts/accounts.subscription.ts b/client/src/app/site/pages/organization/pages/accounts/accounts.subscription.ts index 63c4d96d91..5ccc6564a6 100644 --- a/client/src/app/site/pages/organization/pages/accounts/accounts.subscription.ts +++ b/client/src/app/site/pages/organization/pages/accounts/accounts.subscription.ts @@ -1,5 +1,5 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; import { ViewMeeting } from '../../../meetings/view-models/view-meeting'; import { ViewUser } from '../../../meetings/view-models/view-user'; diff --git a/client/src/app/site/pages/organization/pages/accounts/components/account-main/account-main.component.ts b/client/src/app/site/pages/organization/pages/accounts/components/account-main/account-main.component.ts index fefb904020..209782a166 100644 --- a/client/src/app/site/pages/organization/pages/accounts/components/account-main/account-main.component.ts +++ b/client/src/app/site/pages/organization/pages/accounts/components/account-main/account-main.component.ts @@ -1,11 +1,11 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { inject } from '@angular/core'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { getMeetingListSubscriptionConfig } from '@app/site/pages/organization/organization.subscription'; +import { OperatorService } from '@app/site/services/operator.service'; import { distinctUntilChanged, map, skip } from 'rxjs'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { getMeetingListSubscriptionConfig } from 'src/app/site/pages/organization/organization.subscription'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { ORGANIZATION_ID } from '../../../../services/organization.service'; import { ViewOrganization } from '../../../../view-models/view-organization'; @@ -42,6 +42,7 @@ const accountListSubsciptionContent = { selector: `os-account-main`, templateUrl: `./account-main.component.html`, styleUrls: [`./account-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AccountMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/account-detail.module.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/account-detail.module.ts index 548971dfef..eb573e913e 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/account-detail.module.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/account-detail.module.ts @@ -11,12 +11,12 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { UserComponentsModule } from 'src/app/site/modules/user-components'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; -import { PipesModule } from 'src/app/ui/pipes'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { UserComponentsModule } from '@app/site/modules/user-components'; +import { DirectivesModule } from '@app/ui/directives'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; +import { PipesModule } from '@app/ui/pipes'; import { CommitteeCommonServiceModule } from '../../../committees/services/committee-common-service.module'; import { AccountCommonServiceModule } from '../../services/common/account-common-service.module'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-add-to-meetings/account-add-to-meetings.component.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-add-to-meetings/account-add-to-meetings.component.ts index 81b5307fca..efe3306b3a 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-add-to-meetings/account-add-to-meetings.component.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-add-to-meetings/account-add-to-meetings.component.ts @@ -1,19 +1,19 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { UntypedFormBuilder, Validators } from '@angular/forms'; import { Router } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { AssignMeetingsResult } from '@app/gateways/repositories/users'; +import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OpenSlidesRouterService } from '@app/site/services/openslides-router.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, filter, map, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { AssignMeetingsResult } from 'src/app/gateways/repositories/users'; -import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OpenSlidesRouterService } from 'src/app/site/services/openslides-router.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; @Component({ selector: `os-account-add-to-meetings`, diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail-main/account-detail-main.component.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail-main/account-detail-main.component.ts index 399a1f1101..604cb260c0 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail-main/account-detail-main.component.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail-main/account-detail-main.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; import { getAccountDetailSubscriptionConfig } from '../../../../accounts.subscription'; @@ -7,6 +7,7 @@ import { getAccountDetailSubscriptionConfig } from '../../../../accounts.subscri selector: `os-account-detail-main`, templateUrl: `./account-detail-main.component.html`, styleUrls: [`./account-detail-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AccountDetailMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.html b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.html index 2d71172f5d..650c38894a 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.html +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.html @@ -301,7 +301,7 @@

{{ 'Committees and meetings' | translate }}

} - diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.ts index a73ac00c0d..27c94c737f 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.ts @@ -1,18 +1,18 @@ import { KeyValue } from '@angular/common'; -import { Component, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core'; import { Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { CML, getOmlVerboseName, OML, OMLMapping } from '@app/domain/definitions/organization-permission'; +import { GetUserScopePresenterService } from '@app/gateways/presenter'; +import { BaseComponent } from '@app/site/base/base.component'; +import { UserDetailViewComponent } from '@app/site/modules/user-components'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OpenSlidesRouterService } from '@app/site/services/openslides-router.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { CML, getOmlVerboseName, OML, OMLMapping } from 'src/app/domain/definitions/organization-permission'; -import { GetUserScopePresenterService } from 'src/app/gateways/presenter'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { UserDetailViewComponent } from 'src/app/site/modules/user-components'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OpenSlidesRouterService } from 'src/app/site/services/openslides-router.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { ViewCommittee } from '../../../../../committees'; import { getCommitteeListMinimalSubscriptionConfig } from '../../../../../committees/committees.subscription'; @@ -39,6 +39,7 @@ interface ParticipationTableMeetingDataRow { selector: `os-account-detail`, templateUrl: `./account-detail.component.html`, styleUrls: [`./account-detail.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AccountDetailComponent extends BaseComponent implements OnInit { diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-password/account-password.component.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-password/account-password.component.ts index 1f67fb79f2..888395ebda 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-password/account-password.component.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-password/account-password.component.ts @@ -1,19 +1,20 @@ -import { AfterViewInit, Component, OnInit } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { PasswordForm } from 'src/app/site/modules/user-components'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { AuthService } from 'src/app/site/services/auth.service'; -import { OpenSlidesRouterService } from 'src/app/site/services/openslides-router.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { BaseComponent } from '@app/site/base/base.component'; +import { PasswordForm } from '@app/site/modules/user-components'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { AuthService } from '@app/site/services/auth.service'; +import { OpenSlidesRouterService } from '@app/site/services/openslides-router.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; @Component({ selector: `os-account-password`, templateUrl: `./account-password.component.html`, styleUrls: [`./account-password.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AccountPasswordComponent extends BaseComponent implements OnInit, AfterViewInit { diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/account-import.module.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/account-import.module.ts index d801a3865a..f1c3542f07 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/account-import.module.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/account-import.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { ImportListModule } from 'src/app/ui/modules/import-list'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { ImportListModule } from '@app/ui/modules/import-list'; import { AccountCommonServiceModule } from '../../services/common/account-common-service.module'; import { AccountImportRoutingModule } from './account-import-routing.module'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.ts index 10b1765b96..fd6772be31 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.ts @@ -1,8 +1,8 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseViaBackendImportListComponent } from '@app/site/base/base-via-backend-import-list.component'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { ImportListHeaderDefinition } from '@app/ui/modules/import-list'; import { TranslateService } from '@ngx-translate/core'; -import { BaseViaBackendImportListComponent } from 'src/app/site/base/base-via-backend-import-list.component'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; -import { ImportListHeaderDefinition } from 'src/app/ui/modules/import-list'; import { accountColumns, accountHeadersAndVerboseNames } from '../../definitions'; import { AccountImportService } from '../../services/account-import.service/account-import.service'; @@ -11,6 +11,7 @@ import { AccountImportService } from '../../services/account-import.service/acco selector: `os-account-import-list`, templateUrl: `./account-import-list.component.html`, styleUrls: [`./account-import-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AccountImportListComponent extends BaseViaBackendImportListComponent { diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/definitions/index.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/definitions/index.ts index 063223aa89..5a18794c10 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/definitions/index.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/definitions/index.ts @@ -1,5 +1,5 @@ +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { _ } from '@ngx-translate/core'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; export const userHeadersAndVerboseNames: Partial> = { title: _(`Title`), diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts index 9097b91be4..88a0e4ef40 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; +import { BaseBackendImportService } from '@app/site/base/base-import.service/base-backend-import.service'; +import { ImportServiceCollectorService } from '@app/site/services/import-service-collector.service'; +import { BackendImportRawPreview } from '@app/ui/modules/import-list/definitions/backend-import-preview'; import { _ } from '@ngx-translate/core'; -import { BaseBackendImportService } from 'src/app/site/base/base-import.service/base-backend-import.service'; -import { ImportServiceCollectorService } from 'src/app/site/services/import-service-collector.service'; -import { BackendImportRawPreview } from 'src/app/ui/modules/import-list/definitions/backend-import-preview'; import { AccountExportService } from '../../../../services/account-export.service'; import { AccountControllerService } from '../../../../services/common/account-controller.service'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/account-list.module.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/account-list.module.ts index 896097c766..8ee02fdf3f 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/account-list.module.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/account-list.module.ts @@ -10,14 +10,14 @@ import { MatRadioModule } from '@angular/material/radio'; import { MatTableModule } from '@angular/material/table'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { UserComponentsModule } from 'src/app/site/modules/user-components'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ChoiceDialogComponent } from 'src/app/ui/modules/choice-dialog'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { ListModule } from 'src/app/ui/modules/list'; -import { PipesModule } from 'src/app/ui/pipes'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { UserComponentsModule } from '@app/site/modules/user-components'; +import { DirectivesModule } from '@app/ui/directives'; +import { ChoiceDialogComponent } from '@app/ui/modules/choice-dialog'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { ListModule } from '@app/ui/modules/list'; +import { PipesModule } from '@app/ui/pipes'; import { AccountExportServiceModule } from '../../services/account-export-service.module'; import { AccountCommonServiceModule } from '../../services/common/account-common-service.module'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-list-main/account-list-main.component.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-list-main/account-list-main.component.ts index e94a3f84ce..ef17acdfdb 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-list-main/account-list-main.component.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-list-main/account-list-main.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; import { getMeetingUserIdsSubscriptionConfig } from '../../../../accounts.subscription'; @@ -7,6 +7,7 @@ import { getMeetingUserIdsSubscriptionConfig } from '../../../../accounts.subscr selector: `os-account-list-main`, templateUrl: `./account-list-main.component.html`, styleUrls: [`./account-list-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class AccountListMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-list/account-list.component.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-list/account-list.component.ts index d17318bf32..5d5b53d55a 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-list/account-list.component.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-list/account-list.component.ts @@ -2,21 +2,21 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { ActivatedRoute } from '@angular/router'; +import { getOmlVerboseName, OML } from '@app/domain/definitions/organization-permission'; +import { OMLMapping } from '@app/domain/definitions/organization-permission'; +import { CommitteeRepositoryService } from '@app/gateways/repositories/committee-repository.service'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseListViewComponent } from '@app/site/base/base-list-view.component'; +import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OperatorService } from '@app/site/services/operator.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { ChoiceService } from '@app/ui/modules/choice-dialog'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom, map, Observable } from 'rxjs'; -import { getOmlVerboseName, OML } from 'src/app/domain/definitions/organization-permission'; -import { OMLMapping } from 'src/app/domain/definitions/organization-permission'; -import { CommitteeRepositoryService } from 'src/app/gateways/repositories/committee-repository.service'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseListViewComponent } from 'src/app/site/base/base-list-view.component'; -import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { ChoiceService } from 'src/app/ui/modules/choice-dialog'; import { ViewCommittee } from '../../../../../committees'; import { AccountExportService } from '../../../../services/account-export.service/account-export.service'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-merge-dialog/account-merge-dialog.component.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-merge-dialog/account-merge-dialog.component.ts index c8dbc442be..096672cd39 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-merge-dialog/account-merge-dialog.component.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/components/account-merge-dialog/account-merge-dialog.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; export interface AccountMergeDialogData { choices: ViewUser[]; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-search/account-list-search.service.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-search/account-list-search.service.ts index d2848d2aba..036b19def5 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-search/account-list-search.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-search/account-list-search.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { ListSearchService } from 'src/app/ui/modules/list/services/list-search.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { ListSearchService } from '@app/ui/modules/list/services/list-search.service'; @Injectable({ providedIn: 'root' diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service.ts index a108cbca5f..6be5a56160 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service.ts @@ -1,9 +1,9 @@ import { Injectable, ProviderToken } from '@angular/core'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { UserRepositoryService } from '@app/gateways/repositories/users'; +import { BaseSortListService, OsSortingOption } from '@app/site/base/base-sort.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { _ } from '@ngx-translate/core'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { UserRepositoryService } from 'src/app/gateways/repositories/users'; -import { BaseSortListService, OsSortingOption } from 'src/app/site/base/base-sort.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; @Injectable({ providedIn: `root` diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/gender/gender.subscription.ts b/client/src/app/site/pages/organization/pages/accounts/pages/gender/gender.subscription.ts index 46095f87e9..4f0aa35b75 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/gender/gender.subscription.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/gender/gender.subscription.ts @@ -1,4 +1,4 @@ -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; import { ORGANIZATION_ID } from '../../../../services/organization.service'; import { ViewOrganization } from '../../../../view-models/view-organization'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/gender/genders.config.ts b/client/src/app/site/pages/organization/pages/accounts/pages/gender/genders.config.ts index d6e066b207..81d3bdbf5d 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/gender/genders.config.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/gender/genders.config.ts @@ -1,6 +1,6 @@ -import { Gender } from 'src/app/domain/models/gender/gender'; -import { GenderRepositoryService } from 'src/app/gateways/repositories/gender/gender-repository.service'; -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; +import { Gender } from '@app/domain/models/gender/gender'; +import { GenderRepositoryService } from '@app/gateways/repositories/gender/gender-repository.service'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; import { ViewGender } from './view-models/view-gender'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/gender/pages/gender-list/components/gender-list/gender-list.component.ts b/client/src/app/site/pages/organization/pages/accounts/pages/gender/pages/gender-list/components/gender-list/gender-list.component.ts index 86ff9b336f..5afd27e96c 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/gender/pages/gender-list/components/gender-list/gender-list.component.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/gender/pages/gender-list/components/gender-list/gender-list.component.ts @@ -1,10 +1,10 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, TemplateRef, ViewChild } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseListViewComponent } from '@app/site/base/base-list-view.component'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseListViewComponent } from 'src/app/site/base/base-list-view.component'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { GenderControllerService } from '../../../../services/gender-controller.service'; import { ViewGender } from '../../../../view-models/view-gender'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/gender/pages/gender-list/gender-list.module.ts b/client/src/app/site/pages/organization/pages/accounts/pages/gender/pages/gender-list/gender-list.module.ts index 60c72dc91d..2091ced190 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/gender/pages/gender-list/gender-list.module.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/gender/pages/gender-list/gender-list.module.ts @@ -9,10 +9,10 @@ import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { ChipComponent } from 'src/app/ui/modules/chip'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar/head-bar.module'; -import { ListModule } from 'src/app/ui/modules/list'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { ChipComponent } from '@app/ui/modules/chip'; +import { HeadBarModule } from '@app/ui/modules/head-bar/head-bar.module'; +import { ListModule } from '@app/ui/modules/list'; import { GenderListComponent } from './components/gender-list/gender-list.component'; import { GenderListRoutingModule } from './gender-list-routing.module'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service.ts b/client/src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service.ts index 9e3e895f97..ec75c6312c 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Gender } from 'src/app/domain/models/gender/gender'; -import { GenderRepositoryService } from 'src/app/gateways/repositories/gender/gender-repository.service'; -import { BaseController } from 'src/app/site/base/base-controller'; -import { ControllerServiceCollectorService } from 'src/app/site/services/controller-service-collector.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { Gender } from '@app/domain/models/gender/gender'; +import { GenderRepositoryService } from '@app/gateways/repositories/gender/gender-repository.service'; +import { BaseController } from '@app/site/base/base-controller'; +import { ControllerServiceCollectorService } from '@app/site/services/controller-service-collector.service'; import { ViewGender } from '../view-models/view-gender'; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/gender/view-models/view-gender.ts b/client/src/app/site/pages/organization/pages/accounts/pages/gender/view-models/view-gender.ts index 7fe0559d2e..d92b2cdf27 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/gender/view-models/view-gender.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/gender/view-models/view-gender.ts @@ -1,7 +1,7 @@ -import { Gender } from 'src/app/domain/models/gender/gender'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization'; +import { Gender } from '@app/domain/models/gender/gender'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { ViewOrganization } from '@app/site/pages/organization/view-models/view-organization'; export class ViewGender extends BaseViewModel { public static readonly COLLECTION = Gender.COLLECTION; diff --git a/client/src/app/site/pages/organization/pages/accounts/services/account-export-service.module.ts b/client/src/app/site/pages/organization/pages/accounts/services/account-export-service.module.ts index 1c228a37c9..cf8197ea0b 100644 --- a/client/src/app/site/pages/organization/pages/accounts/services/account-export-service.module.ts +++ b/client/src/app/site/pages/organization/pages/accounts/services/account-export-service.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { ExportServiceModule } from 'src/app/gateways/export'; +import { ExportServiceModule } from '@app/gateways/export'; @NgModule({ imports: [ExportServiceModule] }) export class AccountExportServiceModule {} diff --git a/client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.ts b/client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.ts index 8114d2c84d..4f0163b34b 100644 --- a/client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; +import { UserExport } from '@app/domain/models/users/user.export'; +import { CsvExportForBackendService } from '@app/gateways/export/csv-export.service/csv-export-for-backend.service'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { TranslateService } from '@ngx-translate/core'; -import { UserExport } from 'src/app/domain/models/users/user.export'; -import { CsvExportForBackendService } from 'src/app/gateways/export/csv-export.service/csv-export-for-backend.service'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; import { AccountCsvExportExample } from '../../export/csv-export-example'; import { accountColumns } from '../../pages/account-import/definitions'; diff --git a/client/src/app/site/pages/organization/pages/accounts/services/common/account-common-service.module.ts b/client/src/app/site/pages/organization/pages/accounts/services/common/account-common-service.module.ts index 7d79fc01a7..18219d553f 100644 --- a/client/src/app/site/pages/organization/pages/accounts/services/common/account-common-service.module.ts +++ b/client/src/app/site/pages/organization/pages/accounts/services/common/account-common-service.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { UserComponentsModule } from 'src/app/site/modules/user-components'; +import { UserComponentsModule } from '@app/site/modules/user-components'; @NgModule({ imports: [UserComponentsModule] }) export class AccountCommonServiceModule {} diff --git a/client/src/app/site/pages/organization/pages/accounts/services/common/account-controller.service.ts b/client/src/app/site/pages/organization/pages/accounts/services/common/account-controller.service.ts index 803fd7651e..a059f0357b 100644 --- a/client/src/app/site/pages/organization/pages/accounts/services/common/account-controller.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/services/common/account-controller.service.ts @@ -1,20 +1,20 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { Identifiable } from '@app/domain/interfaces'; +import { User } from '@app/domain/models/users/user'; +import { Action } from '@app/gateways/actions'; +import { UserRepositoryService } from '@app/gateways/repositories/users'; +import { BaseController } from '@app/site/base/base-controller'; +import { UserDeleteDialogService } from '@app/site/modules/user-components'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { ControllerServiceCollectorService } from '@app/site/services/controller-service-collector.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { BackendImportRawPreview } from '@app/ui/modules/import-list/definitions/backend-import-preview'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { _ } from '@ngx-translate/core'; import { firstValueFrom, map, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { User } from 'src/app/domain/models/users/user'; -import { Action } from 'src/app/gateways/actions'; -import { UserRepositoryService } from 'src/app/gateways/repositories/users'; -import { BaseController } from 'src/app/site/base/base-controller'; -import { UserDeleteDialogService } from 'src/app/site/modules/user-components'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { ControllerServiceCollectorService } from 'src/app/site/services/controller-service-collector.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { BackendImportRawPreview } from 'src/app/ui/modules/import-list/definitions/backend-import-preview'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; @Injectable({ providedIn: 'root' diff --git a/client/src/app/site/pages/organization/pages/accounts/services/common/account-filter.service.ts b/client/src/app/site/pages/organization/pages/accounts/services/common/account-filter.service.ts index f6abc0c479..9f488b401c 100644 --- a/client/src/app/site/pages/organization/pages/accounts/services/common/account-filter.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/services/common/account-filter.service.ts @@ -1,14 +1,14 @@ import { Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { BaseFilterListService, OsFilter } from '@app/site/base/base-filter.service'; +import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; +import { DuplicateStatus, ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { ActiveFiltersService } from '@app/site/services/active-filters.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { UserControllerService } from '@app/site/services/user-controller.service'; import { _ } from '@ngx-translate/core'; import { map, Observable, Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { BaseFilterListService, OsFilter } from 'src/app/site/base/base-filter.service'; -import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; -import { DuplicateStatus, ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { ActiveFiltersService } from 'src/app/site/services/active-filters.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { UserControllerService } from 'src/app/site/services/user-controller.service'; import { GenderControllerService } from '../../pages/gender/services/gender-controller.service'; diff --git a/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts b/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts index 19c433eb37..07634b98da 100644 --- a/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts +++ b/client/src/app/site/pages/organization/pages/committees/committees.subscription.ts @@ -1,7 +1,7 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization'; +import { Id } from '@app/domain/definitions/key-types'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { ViewOrganization } from '@app/site/pages/organization/view-models/view-organization'; import { ViewMeeting } from '../../../meetings/view-models/view-meeting'; import { ViewCommittee } from './view-models'; diff --git a/client/src/app/site/pages/organization/pages/committees/export/committee-csv-export-example.ts b/client/src/app/site/pages/organization/pages/committees/export/committee-csv-export-example.ts index 01a3bb2ef1..6450533f43 100644 --- a/client/src/app/site/pages/organization/pages/committees/export/committee-csv-export-example.ts +++ b/client/src/app/site/pages/organization/pages/committees/export/committee-csv-export-example.ts @@ -1,4 +1,4 @@ -import { CommitteeCsvPort } from 'src/app/domain/models/comittees/committee.constants'; +import { CommitteeCsvPort } from '@app/domain/models/comittees/committee.constants'; export const COMMITTEE_CSV_EXPORT_EXAMPLE: Partial[] = [ { diff --git a/client/src/app/site/pages/organization/pages/committees/modules/committee-components.module.ts b/client/src/app/site/pages/organization/pages/committees/modules/committee-components.module.ts index fae99daad1..55b59683ed 100644 --- a/client/src/app/site/pages/organization/pages/committees/modules/committee-components.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/modules/committee-components.module.ts @@ -9,9 +9,9 @@ import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ChipComponent } from 'src/app/ui/modules/chip'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; +import { DirectivesModule } from '@app/ui/directives'; +import { ChipComponent } from '@app/ui/modules/chip'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; import { MeetingTimeComponent } from '../../../../../../ui/modules/meeting-time/meeting-time.component'; import { OpenSlidesTranslationModule } from '../../../../../modules/translations'; diff --git a/client/src/app/site/pages/organization/pages/committees/modules/committee-meeting-preview/committee-meeting-preview.component.ts b/client/src/app/site/pages/organization/pages/committees/modules/committee-meeting-preview/committee-meeting-preview.component.ts index d0081e86ae..981cb87462 100644 --- a/client/src/app/site/pages/organization/pages/committees/modules/committee-meeting-preview/committee-meeting-preview.component.ts +++ b/client/src/app/site/pages/organization/pages/committees/modules/committee-meeting-preview/committee-meeting-preview.component.ts @@ -1,12 +1,12 @@ -import { Component, inject, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; +import { CML, OML } from '@app/domain/definitions/organization-permission'; +import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { CML, OML } from 'src/app/domain/definitions/organization-permission'; -import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { ViewCommittee } from '../../view-models'; import { MeetingService } from '../services/meeting.service'; @@ -16,6 +16,7 @@ import { MeetingService } from '../services/meeting.service'; templateUrl: `./committee-meeting-preview.component.html`, styleUrls: [`./committee-meeting-preview.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CommitteeMeetingPreviewComponent implements OnDestroy, OnInit { diff --git a/client/src/app/site/pages/organization/pages/committees/modules/committee-meta-info/committee-meta-info.component.ts b/client/src/app/site/pages/organization/pages/committees/modules/committee-meta-info/committee-meta-info.component.ts index a5a4675494..ec1e23fb06 100644 --- a/client/src/app/site/pages/organization/pages/committees/modules/committee-meta-info/committee-meta-info.component.ts +++ b/client/src/app/site/pages/organization/pages/committees/modules/committee-meta-info/committee-meta-info.component.ts @@ -1,9 +1,10 @@ -import { Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; @Component({ selector: `os-committee-meta-info`, templateUrl: `./committee-meta-info.component.html`, styleUrls: [`./committee-meta-info.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CommitteeMetaInfoComponent { diff --git a/client/src/app/site/pages/organization/pages/committees/modules/services/committee-components-service.module.ts b/client/src/app/site/pages/organization/pages/committees/modules/services/committee-components-service.module.ts index 17433db027..109a2092db 100644 --- a/client/src/app/site/pages/organization/pages/committees/modules/services/committee-components-service.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/modules/services/committee-components-service.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { ExportServiceModule } from 'src/app/gateways/export'; +import { ExportServiceModule } from '@app/gateways/export'; import { AccountCommonServiceModule } from '../../../accounts/services/common/account-common-service.module'; diff --git a/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.ts b/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.ts index 8fe178e26a..56ac4a93c9 100644 --- a/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.ts @@ -1,8 +1,8 @@ import { inject, Injectable } from '@angular/core'; import { Router } from '@angular/router'; -import { FileExportService } from 'src/app/gateways/export/file-export.service/file-export.service'; -import { ExportMeetingPresenterService } from 'src/app/gateways/presenter/export-meeting-presenter.service'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; +import { FileExportService } from '@app/gateways/export/file-export.service/file-export.service'; +import { ExportMeetingPresenterService } from '@app/gateways/presenter/export-meeting-presenter.service'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; import { AccountFilterService } from '../../../accounts/services/common/account-filter.service'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/components/committee-detail/committee-detail.component.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/components/committee-detail/committee-detail.component.ts index c1b41504a0..c2e5fecb85 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/components/committee-detail/committee-detail.component.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/components/committee-detail/committee-detail.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component/base-model-request-handler.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component/base-model-request-handler.component'; import { getCommitteeDetailSubscriptionConfig } from '../../../../committees.subscription'; @@ -7,6 +7,7 @@ import { getCommitteeDetailSubscriptionConfig } from '../../../../committees.sub selector: `os-committee-detail`, templateUrl: `./committee-detail.component.html`, styleUrls: [`./committee-detail.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CommitteeDetailComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/committee-detail-edit.module.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/committee-detail-edit.module.ts index d42aa77833..3a5686bb2e 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/committee-detail-edit.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/committee-detail-edit.module.ts @@ -4,11 +4,11 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatCardModule } from '@angular/material/card'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { AccountSearchSelectorModule } from 'src/app/site/pages/organization/modules/account-search-selector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { AccountSearchSelectorModule } from '@app/site/pages/organization/modules/account-search-selector'; +import { DirectivesModule } from '@app/ui/directives'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; import { OrganizationTagCommonServiceModule } from '../../../../../organization-tags/services/organization-tag-common-service.module'; import { CommitteeDetailEditRoutingModule } from './committee-detail-edit-routing.module'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/components/committee-detail-edit/committee-detail-edit.component.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/components/committee-detail-edit/committee-detail-edit.component.ts index 7dacf4f8ac..4eb5fe6800 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/components/committee-detail-edit/committee-detail-edit.component.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-edit/components/committee-detail-edit/committee-detail-edit.component.ts @@ -1,19 +1,19 @@ -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { CML } from '@app/domain/definitions/organization-permission'; +import { Identifiable } from '@app/domain/interfaces'; +import { Selectable } from '@app/domain/interfaces/selectable'; +import { BaseComponent } from '@app/site/base/base.component'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { OrganizationTagControllerService } from '@app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { OsOptionSelectionChanged } from '@app/ui/modules/search-selector'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { map, OperatorFunction } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { CML } from 'src/app/domain/definitions/organization-permission'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Selectable } from 'src/app/domain/interfaces/selectable'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { OrganizationTagControllerService } from 'src/app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { OsOptionSelectionChanged } from 'src/app/ui/modules/search-selector'; import { CommitteeControllerService } from '../../../../../../services/committee-controller.service'; import { ViewCommittee } from '../../../../../../view-models'; @@ -28,6 +28,7 @@ const RECEIVE_FORWARDING_DISABLED_TOOLTIP = _(`You can change this option only i selector: `os-committee-detail-edit`, templateUrl: `./committee-detail-edit.component.html`, styleUrls: [`./committee-detail-edit.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CommitteeDetailEditComponent extends BaseComponent implements OnInit { diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/committee-detail-meeting.module.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/committee-detail-meeting.module.ts index 3859f4b33f..af940f556b 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/committee-detail-meeting.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/committee-detail-meeting.module.ts @@ -7,14 +7,14 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { AccountSearchSelectorModule } from 'src/app/site/pages/organization/modules/account-search-selector'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { DatepickerModule } from 'src/app/ui/modules/datepicker'; -import { FileUploadModule } from 'src/app/ui/modules/file-upload'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { OpenSlidesDateAdapterModule } from 'src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.module'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { AccountSearchSelectorModule } from '@app/site/pages/organization/modules/account-search-selector'; +import { DirectivesModule } from '@app/ui/directives'; +import { DatepickerModule } from '@app/ui/modules/datepicker'; +import { FileUploadModule } from '@app/ui/modules/file-upload'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { OpenSlidesDateAdapterModule } from '@app/ui/modules/openslides-date-adapter/openslides-date-adapter.module'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; import { OrganizationTagCommonServiceModule } from '../../../../../organization-tags/services/organization-tag-common-service.module'; import { CommitteeDetailMeetingRoutingModule } from './committee-detail-meeting-routing.module'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/committee-detail-meeting-main/committee-detail-meeting-main.component.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/committee-detail-meeting-main/committee-detail-meeting-main.component.ts index bc73c0f1cf..fbb5fa36d6 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/committee-detail-meeting-main/committee-detail-meeting-main.component.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/committee-detail-meeting-main/committee-detail-meeting-main.component.ts @@ -1,7 +1,7 @@ -import { Component } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component'; -import { getMeetingCreateSubscriptionConfig } from 'src/app/site/pages/organization/organization.subscription'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component'; +import { getMeetingCreateSubscriptionConfig } from '@app/site/pages/organization/organization.subscription'; import { getCommitteeMeetingDetailSubscriptionConfig } from '../../../../../../committees.subscription'; @@ -9,6 +9,7 @@ import { getCommitteeMeetingDetailSubscriptionConfig } from '../../../../../../c selector: `os-committee-detail-meeting-main`, templateUrl: `./committee-detail-meeting-main.component.html`, styleUrls: [`./committee-detail-meeting-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CommitteeDetailMeetingMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html index 0ef0346973..e82aaae715 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-meeting/components/meeting-edit/meeting-edit.component.html @@ -85,7 +85,7 @@

- + {{ 'Tags' | translate }} - {{ manager }} + + {{ manager }} + {{ manager }} diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-view/components/committee-detail-view/committee-detail-view.component.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-view/components/committee-detail-view/committee-detail-view.component.ts index 87b3888498..3b5791f767 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-view/components/committee-detail-view/committee-detail-view.component.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-detail/modules/committee-detail-view/components/committee-detail-view/committee-detail-view.component.ts @@ -1,16 +1,16 @@ -import { Component, OnDestroy, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnDestroy, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { CML, OML } from '@app/domain/definitions/organization-permission'; +import { Committee } from '@app/domain/models/comittees/committee'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; +import { ListComponent } from '@app/ui/modules/list'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; import { combineLatest, map, Observable, Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { CML, OML } from 'src/app/domain/definitions/organization-permission'; -import { Committee } from 'src/app/domain/models/comittees/committee'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { OrganizationSettingsService } from 'src/app/site/pages/organization/services/organization-settings.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; -import { ListComponent } from 'src/app/ui/modules/list'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { CommitteeControllerService } from '../../../../../../services/committee-controller.service'; import { ViewCommittee } from '../../../../../../view-models/view-committee'; @@ -21,6 +21,7 @@ import { CommitteeSortService } from '../../../../../committee-list/services/com selector: `os-committee-detail-view`, templateUrl: `./committee-detail-view.component.html`, styleUrls: [`./committee-detail-view.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CommitteeDetailViewComponent extends BaseUiComponent implements OnDestroy { diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/committee-import.module.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/committee-import.module.ts index ab4c5d1d8f..0bdf40e65d 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/committee-import.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/committee-import.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { ImportListModule } from 'src/app/ui/modules/import-list'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { ImportListModule } from '@app/ui/modules/import-list'; import { CommitteeImportRoutingModule } from './committee-import-routing.module'; import { CommitteeImportListComponent } from './components/committee-import-list/committee-import-list.component'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/components/committee-import-list/committee-import-list.component.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/components/committee-import-list/committee-import-list.component.ts index e161849ac2..240eba4429 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/components/committee-import-list/committee-import-list.component.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/components/committee-import-list/committee-import-list.component.ts @@ -1,7 +1,7 @@ -import { Component } from '@angular/core'; -import { BaseViaBackendImportListComponent } from 'src/app/site/base/base-via-backend-import-list.component'; -import { committeeHeadersAndVerboseNames } from 'src/app/site/pages/organization/pages/committees/pages/committee-import/definitions'; -import { ImportListHeaderDefinition } from 'src/app/ui/modules/import-list'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseViaBackendImportListComponent } from '@app/site/base/base-via-backend-import-list.component'; +import { committeeHeadersAndVerboseNames } from '@app/site/pages/organization/pages/committees/pages/committee-import/definitions'; +import { ImportListHeaderDefinition } from '@app/ui/modules/import-list'; import { CommitteeImportService } from '../../services/committee-import.service/committee-import.service'; @@ -9,6 +9,7 @@ import { CommitteeImportService } from '../../services/committee-import.service/ selector: `os-committee-import-list`, templateUrl: `./committee-import-list.component.html`, styleUrls: [`./committee-import-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CommitteeImportListComponent extends BaseViaBackendImportListComponent { diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import-service.module.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import-service.module.ts index 9a439843e7..7c744e6597 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import-service.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import-service.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { ExportServiceModule } from 'src/app/gateways/export'; +import { ExportServiceModule } from '@app/gateways/export'; @NgModule({ imports: [ExportServiceModule] }) export class CommitteeImportServiceModule {} diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts index 5346e40282..55e60ea8fe 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts @@ -1,9 +1,9 @@ import { inject, Injectable } from '@angular/core'; +import { CsvExportForBackendService } from '@app/gateways/export/csv-export.service/csv-export-for-backend.service'; +import { BaseBackendImportService } from '@app/site/base/base-import.service/base-backend-import.service'; +import { ImportServiceCollectorService } from '@app/site/services/import-service-collector.service'; +import { BackendImportRawPreview } from '@app/ui/modules/import-list/definitions/backend-import-preview'; import { _ } from '@ngx-translate/core'; -import { CsvExportForBackendService } from 'src/app/gateways/export/csv-export.service/csv-export-for-backend.service'; -import { BaseBackendImportService } from 'src/app/site/base/base-import.service/base-backend-import.service'; -import { ImportServiceCollectorService } from 'src/app/site/services/import-service-collector.service'; -import { BackendImportRawPreview } from 'src/app/ui/modules/import-list/definitions/backend-import-preview'; import { COMMITTEE_CSV_EXPORT_EXAMPLE } from '../../../../export'; import { CommitteeControllerService } from '../../../../services/committee-controller.service'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/committee-list.module.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/committee-list.module.ts index 2264b9c039..e714cc8eab 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/committee-list.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/committee-list.module.ts @@ -4,14 +4,14 @@ import { MatButtonModule } from '@angular/material/button'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ChipComponent } from 'src/app/ui/modules/chip'; -import { ChoiceDialogComponent } from 'src/app/ui/modules/choice-dialog'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { ListModule } from 'src/app/ui/modules/list'; -import { ScrollingTableModule } from 'src/app/ui/modules/scrolling-table'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { ChipComponent } from '@app/ui/modules/chip'; +import { ChoiceDialogComponent } from '@app/ui/modules/choice-dialog'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { ListModule } from '@app/ui/modules/list'; +import { ScrollingTableModule } from '@app/ui/modules/scrolling-table'; import { CommitteeListRoutingModule } from './committee-list-routing.module'; import { CommitteeListComponent } from './components/committee-list/committee-list.component'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/components/committee-list/committee-list.component.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/components/committee-list/committee-list.component.ts index e187bea4d0..06f81eeee1 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/components/committee-list/committee-list.component.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/components/committee-list/committee-list.component.ts @@ -1,14 +1,14 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { Action } from '@app/gateways/actions'; +import { BaseListViewComponent } from '@app/site/base/base-list-view.component'; +import { SpinnerService } from '@app/site/modules/global-spinner'; +import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ChoiceAnswer } from '@app/ui/modules/choice-dialog/definitions'; +import { ChoiceService } from '@app/ui/modules/choice-dialog/services/choice.service'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; -import { Action } from 'src/app/gateways/actions'; -import { BaseListViewComponent } from 'src/app/site/base/base-list-view.component'; -import { SpinnerService } from 'src/app/site/modules/global-spinner'; -import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ChoiceAnswer } from 'src/app/ui/modules/choice-dialog/definitions'; -import { ChoiceService } from 'src/app/ui/modules/choice-dialog/services/choice.service'; import { ViewOrganizationTag } from '../../../../../organization-tags'; import { OrganizationTagControllerService } from '../../../../../organization-tags/services/organization-tag-controller.service'; @@ -26,6 +26,7 @@ const COMMITTEE_LIST_STORAGE_INDEX = `committee_list`; selector: `os-committee-list`, templateUrl: `./committee-list.component.html`, styleUrls: [`./committee-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CommitteeListComponent extends BaseListViewComponent { diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.ts index e7f370a302..d71171f746 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; +import { CsvColumnsDefinition } from '@app/gateways/export/csv-export.service'; +import { CsvExportForBackendService } from '@app/gateways/export/csv-export.service/csv-export-for-backend.service'; import { TranslateService } from '@ngx-translate/core'; -import { CsvColumnsDefinition } from 'src/app/gateways/export/csv-export.service'; -import { CsvExportForBackendService } from 'src/app/gateways/export/csv-export.service/csv-export-for-backend.service'; import { ViewCommittee } from '../../../../view-models/view-committee'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-filter.service/committee-filter.service.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-filter.service/committee-filter.service.ts index 056c7ed21d..5917a0ac0a 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-filter.service/committee-filter.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-filter.service/committee-filter.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; +import { BaseFilterListService, OsFilter } from '@app/site/base/base-filter.service'; +import { OrganizationTagControllerService } from '@app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service'; +import { ActiveFiltersService } from '@app/site/services/active-filters.service'; import { _ } from '@ngx-translate/core'; -import { BaseFilterListService, OsFilter } from 'src/app/site/base/base-filter.service'; -import { OrganizationTagControllerService } from 'src/app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service'; -import { ActiveFiltersService } from 'src/app/site/services/active-filters.service'; import { ViewCommittee } from '../../../../view-models'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-service.module.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-service.module.ts index 885e98c6e1..7fc99c6701 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-service.module.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-service.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { ExportServiceModule } from 'src/app/gateways/export'; +import { ExportServiceModule } from '@app/gateways/export'; import { OrganizationTagCommonServiceModule } from '../../../../organization-tags/services/organization-tag-common-service.module'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service.ts index 924d27f7a9..a9c03e1694 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service.ts @@ -1,8 +1,8 @@ import { Injectable, ProviderToken } from '@angular/core'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { CommitteeRepositoryService } from '@app/gateways/repositories/committee-repository.service'; +import { BaseSortListService, OsSortingOption } from '@app/site/base/base-sort.service'; import { _ } from '@ngx-translate/core'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { CommitteeRepositoryService } from 'src/app/gateways/repositories/committee-repository.service'; -import { BaseSortListService, OsSortingOption } from 'src/app/site/base/base-sort.service'; import { ViewCommittee } from '../../../../view-models'; diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-main/components/committee-main/committee-main.component.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-main/components/committee-main/committee-main.component.ts index 6d47e56c5d..835a9d106f 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-main/components/committee-main/committee-main.component.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-main/components/committee-main/committee-main.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component/base-model-request-handler.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component/base-model-request-handler.component'; import { getOrganizationTagListSubscriptionConfig } from '../../../../../organization-tags/organization-tags.subscription'; import { getCommitteeListSubscriptionConfig } from '../../../../committees.subscription'; @@ -8,6 +8,7 @@ import { getCommitteeListSubscriptionConfig } from '../../../../committees.subsc selector: `os-committee-main`, templateUrl: `./committee-main.component.html`, styleUrls: [`./committee-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CommitteeMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/organization/pages/committees/services/committee-controller.service.ts b/client/src/app/site/pages/organization/pages/committees/services/committee-controller.service.ts index db8c215cf5..d517f31fe7 100644 --- a/client/src/app/site/pages/organization/pages/committees/services/committee-controller.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/services/committee-controller.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Action } from 'src/app/gateways/actions'; -import { BackendImportRawPreview } from 'src/app/ui/modules/import-list/definitions/backend-import-preview'; +import { Action } from '@app/gateways/actions'; +import { BackendImportRawPreview } from '@app/ui/modules/import-list/definitions/backend-import-preview'; import { Ids } from '../../../../../../domain/definitions/key-types'; import { Identifiable } from '../../../../../../domain/interfaces'; diff --git a/client/src/app/site/pages/organization/pages/committees/view-models/view-committee.ts b/client/src/app/site/pages/organization/pages/committees/view-models/view-committee.ts index 4217bd6320..5350ce9bd7 100644 --- a/client/src/app/site/pages/organization/pages/committees/view-models/view-committee.ts +++ b/client/src/app/site/pages/organization/pages/committees/view-models/view-committee.ts @@ -1,10 +1,10 @@ +import { Id } from '@app/domain/definitions/key-types'; +import { Committee } from '@app/domain/models/comittees/committee'; +import { BaseViewModel, ViewModelRelations } from '@app/site/base/base-view-model'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { ViewOrganization } from '@app/site/pages/organization/view-models/view-organization'; import { Observable, of } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Committee } from 'src/app/domain/models/comittees/committee'; -import { BaseViewModel, ViewModelRelations } from 'src/app/site/base/base-view-model'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization'; import { HasOrganizationTags } from '../../organization-tags/view-models/has-organization-tags'; diff --git a/client/src/app/site/pages/organization/pages/dashboard/dashboard.subscription.ts b/client/src/app/site/pages/organization/pages/dashboard/dashboard.subscription.ts index a2834e3874..27e3cb2cd1 100644 --- a/client/src/app/site/pages/organization/pages/dashboard/dashboard.subscription.ts +++ b/client/src/app/site/pages/organization/pages/dashboard/dashboard.subscription.ts @@ -1,7 +1,7 @@ -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; -import { Meeting } from 'src/app/domain/models/meetings/meeting'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; +import { Meeting } from '@app/domain/models/meetings/meeting'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { ViewOrganization } from '@app/site/pages/organization/view-models/view-organization'; export const DASHBOARD_MEETING_LIST_SUBSCRIPTION = `dashboard_meeting_list`; diff --git a/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/components/dashboard/dashboard.component.html b/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/components/dashboard/dashboard.component.html index 611a26ea22..ce3141a296 100644 --- a/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/components/dashboard/dashboard.component.html +++ b/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/components/dashboard/dashboard.component.html @@ -152,12 +152,12 @@

Calendar

-
+
@if (meeting.canBeEnteredBy(operator.user)) { Calendar

> } @else { -
+
Calendar

}" > @if (meeting.location) { - {{ meeting.location }} + {{ meeting.location }} } @if (meeting.location && (meeting.start_time || meeting.end_time)) { -  ·  +  ·  } @if (meeting.start_time || meeting.end_time) { - + }

diff --git a/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/components/dashboard/dashboard.component.ts b/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/components/dashboard/dashboard.component.ts index 6cbc840435..3a0931bc11 100644 --- a/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/components/dashboard/dashboard.component.ts +++ b/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/components/dashboard/dashboard.component.ts @@ -1,11 +1,11 @@ -import { Component, inject, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject, ViewEncapsulation } from '@angular/core'; +import { BaseComponent } from '@app/site/base/base.component'; +import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; +import { RelatedTime, ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { OrganizationService } from '@app/site/pages/organization/services/organization.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ThemeService } from '@app/site/services/theme.service'; import { Observable } from 'rxjs'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { MeetingControllerService } from 'src/app/site/pages/meetings/services/meeting-controller.service'; -import { RelatedTime, ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { OrganizationService } from 'src/app/site/pages/organization/services/organization.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ThemeService } from 'src/app/site/services/theme.service'; import { DASHBOARD_MEETING_LIST_SUBSCRIPTION } from '../../../../dashboard.subscription'; @@ -14,6 +14,7 @@ import { DASHBOARD_MEETING_LIST_SUBSCRIPTION } from '../../../../dashboard.subsc templateUrl: `./dashboard.component.html`, styleUrls: [`./dashboard.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class DashboardComponent extends BaseComponent { diff --git a/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/dashboard-detail.module.ts b/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/dashboard-detail.module.ts index ccb5381e2d..bed03408d6 100644 --- a/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/dashboard-detail.module.ts +++ b/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-detail/dashboard-detail.module.ts @@ -7,9 +7,9 @@ import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { MeetingTimeComponent } from 'src/app/ui/modules/meeting-time/meeting-time.component'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { MeetingTimeComponent } from '@app/ui/modules/meeting-time/meeting-time.component'; import { IconContainerComponent } from '../../../../../../../ui/modules/icon-container'; import { DashboardComponent } from './components/dashboard/dashboard.component'; diff --git a/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-main/components/dashboard-main/dashboard-main.component.ts b/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-main/components/dashboard-main/dashboard-main.component.ts index daa11226c1..455aebb330 100644 --- a/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-main/components/dashboard-main/dashboard-main.component.ts +++ b/client/src/app/site/pages/organization/pages/dashboard/pages/dashboard-main/components/dashboard-main/dashboard-main.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component/base-model-request-handler.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component/base-model-request-handler.component'; import { getDashboardMeetingListSubscriptionConfig } from '../../../../dashboard.subscription'; @@ -7,6 +7,7 @@ import { getDashboardMeetingListSubscriptionConfig } from '../../../../dashboard selector: `os-dashboard-main`, templateUrl: `./dashboard-main.component.html`, styleUrls: [`./dashboard-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class DashboardMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/organization/pages/designs/designs.config.ts b/client/src/app/site/pages/organization/pages/designs/designs.config.ts index df26c8fca9..f6cc721ab2 100644 --- a/client/src/app/site/pages/organization/pages/designs/designs.config.ts +++ b/client/src/app/site/pages/organization/pages/designs/designs.config.ts @@ -1,6 +1,6 @@ -import { Theme } from 'src/app/domain/models/theme/theme'; -import { ThemeRepositoryService } from 'src/app/gateways/repositories/themes/theme-repository.service'; -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; +import { Theme } from '@app/domain/models/theme/theme'; +import { ThemeRepositoryService } from '@app/gateways/repositories/themes/theme-repository.service'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; import { ViewTheme } from './view-models/view-theme'; export const DesignsAppConfig: AppConfig = { diff --git a/client/src/app/site/pages/organization/pages/designs/designs.module.ts b/client/src/app/site/pages/organization/pages/designs/designs.module.ts index b003d5beb0..d9decb5f1f 100644 --- a/client/src/app/site/pages/organization/pages/designs/designs.module.ts +++ b/client/src/app/site/pages/organization/pages/designs/designs.module.ts @@ -7,10 +7,10 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { ColorFormFieldComponent } from 'src/app/ui/modules/color-form-field'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { ListModule } from 'src/app/ui/modules/list'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { ColorFormFieldComponent } from '@app/ui/modules/color-form-field'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { ListModule } from '@app/ui/modules/list'; import { DesignsRoutingModule } from './designs-routing.module'; import { DesignMainModule } from './pages/design-main/design-main.module'; diff --git a/client/src/app/site/pages/organization/pages/designs/designs.subscription.ts b/client/src/app/site/pages/organization/pages/designs/designs.subscription.ts index 1fa89234c7..f34695b6d6 100644 --- a/client/src/app/site/pages/organization/pages/designs/designs.subscription.ts +++ b/client/src/app/site/pages/organization/pages/designs/designs.subscription.ts @@ -1,6 +1,6 @@ -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { ViewOrganization } from '@app/site/pages/organization/view-models/view-organization'; export const THEME_LIST_SUBSCRIPTION = `theme_list`; diff --git a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/components/theme-builder-dialog.component.ts b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/components/theme-builder-dialog.component.ts index 0514dfdec1..321cf08b88 100644 --- a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/components/theme-builder-dialog.component.ts +++ b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/components/theme-builder-dialog.component.ts @@ -1,13 +1,13 @@ -import { AfterViewInit, Component, Inject } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { ThemePalette } from '@angular/material/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { Theme, ThemeGeneralColors } from '@app/domain/models/theme/theme'; +import { OrganizationService } from '@app/site/pages/organization/services/organization.service'; +import { ColorService } from '@app/site/services/color.service'; +import { GENERAL_DEFAULT_COLORS, ThemeService } from '@app/site/services/theme.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Theme, ThemeGeneralColors } from 'src/app/domain/models/theme/theme'; -import { OrganizationService } from 'src/app/site/pages/organization/services/organization.service'; -import { ColorService } from 'src/app/site/services/color.service'; -import { GENERAL_DEFAULT_COLORS, ThemeService } from 'src/app/site/services/theme.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; type ThemeBuilderDialogData = { [K in keyof Theme]?: string; @@ -17,6 +17,7 @@ type ThemeBuilderDialogData = { selector: `os-theme-builder-dialog`, templateUrl: `./theme-builder-dialog.component.html`, styleUrls: [`./theme-builder-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ThemeBuilderDialogComponent extends BaseUiComponent implements AfterViewInit { diff --git a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/services/theme-builder-dialog.service.ts b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/services/theme-builder-dialog.service.ts index b9837c6260..1609a9433e 100644 --- a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/services/theme-builder-dialog.service.ts +++ b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/services/theme-builder-dialog.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; @Injectable({ providedIn: 'root' diff --git a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/theme-builder-dialog.module.ts b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/theme-builder-dialog.module.ts index e7696d46b7..d238d1a3bc 100644 --- a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/theme-builder-dialog.module.ts +++ b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/theme-builder-dialog.module.ts @@ -6,8 +6,8 @@ import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { ColorFormFieldComponent } from 'src/app/ui/modules/color-form-field'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { ColorFormFieldComponent } from '@app/ui/modules/color-form-field'; import { ThemeBuilderDialogComponent } from './components/theme-builder-dialog.component'; diff --git a/client/src/app/site/pages/organization/pages/designs/pages/design-main/components/design-main/design-main.component.ts b/client/src/app/site/pages/organization/pages/designs/pages/design-main/components/design-main/design-main.component.ts index b6ee32aa41..e7844aa83d 100644 --- a/client/src/app/site/pages/organization/pages/designs/pages/design-main/components/design-main/design-main.component.ts +++ b/client/src/app/site/pages/organization/pages/designs/pages/design-main/components/design-main/design-main.component.ts @@ -1,5 +1,5 @@ -import { Component } from '@angular/core'; -import { BaseModelRequestHandlerComponent } from 'src/app/site/base/base-model-request-handler.component/base-model-request-handler.component'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseModelRequestHandlerComponent } from '@app/site/base/base-model-request-handler.component/base-model-request-handler.component'; import { getDesignListSubscriptionConfig } from '../../../../designs.subscription'; @@ -7,6 +7,7 @@ import { getDesignListSubscriptionConfig } from '../../../../designs.subscriptio selector: `os-design-main`, templateUrl: `./design-main.component.html`, styleUrls: [`./design-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class DesignMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/organization/pages/designs/pages/theme-list/components/theme-list/theme-list.component.ts b/client/src/app/site/pages/organization/pages/designs/pages/theme-list/components/theme-list/theme-list.component.ts index 69a36abdaf..f73284a06f 100644 --- a/client/src/app/site/pages/organization/pages/designs/pages/theme-list/components/theme-list/theme-list.component.ts +++ b/client/src/app/site/pages/organization/pages/designs/pages/theme-list/components/theme-list/theme-list.component.ts @@ -1,11 +1,11 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseListViewComponent } from '@app/site/base/base-list-view.component'; +import { ViewTheme } from '@app/site/pages/organization/pages/designs'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom } from 'rxjs'; -import { BaseListViewComponent } from 'src/app/site/base/base-list-view.component'; -import { ViewTheme } from 'src/app/site/pages/organization/pages/designs'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { ThemeBuilderDialogService } from '../../../../modules/theme-builder-dialog/services/theme-builder-dialog.service'; import { ThemeControllerService } from '../../../../services/theme-controller.service'; @@ -14,6 +14,7 @@ import { ThemeControllerService } from '../../../../services/theme-controller.se selector: `os-theme-list`, templateUrl: `./theme-list.component.html`, styleUrls: [`./theme-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ThemeListComponent extends BaseListViewComponent { diff --git a/client/src/app/site/pages/organization/pages/designs/pages/theme-list/theme-list.module.ts b/client/src/app/site/pages/organization/pages/designs/pages/theme-list/theme-list.module.ts index d20faea79a..71b062f601 100644 --- a/client/src/app/site/pages/organization/pages/designs/pages/theme-list/theme-list.module.ts +++ b/client/src/app/site/pages/organization/pages/designs/pages/theme-list/theme-list.module.ts @@ -5,10 +5,10 @@ import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { ListModule } from 'src/app/ui/modules/list'; -import { PromptCheckboxComponent } from 'src/app/ui/modules/prompt-checkbox'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { ListModule } from '@app/ui/modules/list'; +import { PromptCheckboxComponent } from '@app/ui/modules/prompt-checkbox'; import { ThemeBuilderDialogModule } from '../../modules/theme-builder-dialog/theme-builder-dialog.module'; import { ThemeCommonServiceModule } from '../../services/theme-common-service.module'; diff --git a/client/src/app/site/pages/organization/pages/designs/services/theme-controller.service.ts b/client/src/app/site/pages/organization/pages/designs/services/theme-controller.service.ts index ec055ec1e4..3f57ffa90b 100644 --- a/client/src/app/site/pages/organization/pages/designs/services/theme-controller.service.ts +++ b/client/src/app/site/pages/organization/pages/designs/services/theme-controller.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Theme } from 'src/app/domain/models/theme/theme'; -import { ThemeRepositoryService } from 'src/app/gateways/repositories/themes/theme-repository.service'; -import { BaseController } from 'src/app/site/base/base-controller'; -import { OrganizationControllerService } from 'src/app/site/pages/organization/services/organization-controller.service'; -import { ControllerServiceCollectorService } from 'src/app/site/services/controller-service-collector.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { Theme } from '@app/domain/models/theme/theme'; +import { ThemeRepositoryService } from '@app/gateways/repositories/themes/theme-repository.service'; +import { BaseController } from '@app/site/base/base-controller'; +import { OrganizationControllerService } from '@app/site/pages/organization/services/organization-controller.service'; +import { ControllerServiceCollectorService } from '@app/site/services/controller-service-collector.service'; import { ViewTheme } from '../view-models'; diff --git a/client/src/app/site/pages/organization/pages/designs/view-models/view-theme.ts b/client/src/app/site/pages/organization/pages/designs/view-models/view-theme.ts index 5dfff90733..385b752d34 100644 --- a/client/src/app/site/pages/organization/pages/designs/view-models/view-theme.ts +++ b/client/src/app/site/pages/organization/pages/designs/view-models/view-theme.ts @@ -1,6 +1,6 @@ -import { Theme } from 'src/app/domain/models/theme/theme'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization'; +import { Theme } from '@app/domain/models/theme/theme'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { ViewOrganization } from '@app/site/pages/organization/view-models/view-organization'; interface ThemeRelations { organization: ViewOrganization; diff --git a/client/src/app/site/pages/organization/pages/mediafiles/components/organization-mediafile-main/organization-mediafile-main.component.ts b/client/src/app/site/pages/organization/pages/mediafiles/components/organization-mediafile-main/organization-mediafile-main.component.ts index 2ef65e840e..dc7a6026d0 100644 --- a/client/src/app/site/pages/organization/pages/mediafiles/components/organization-mediafile-main/organization-mediafile-main.component.ts +++ b/client/src/app/site/pages/organization/pages/mediafiles/components/organization-mediafile-main/organization-mediafile-main.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { BaseModelRequestHandlerComponent, ModelRequestConfig -} from 'src/app/site/base/base-model-request-handler.component'; +} from '@app/site/base/base-model-request-handler.component'; import { getOrganizationMediafileListSubscriptionConfig } from '../../mediafiles.subscription'; diff --git a/client/src/app/site/pages/organization/pages/mediafiles/mediafiles-routing.module.ts b/client/src/app/site/pages/organization/pages/mediafiles/mediafiles-routing.module.ts index 9bba7c4709..91c1a561e2 100644 --- a/client/src/app/site/pages/organization/pages/mediafiles/mediafiles-routing.module.ts +++ b/client/src/app/site/pages/organization/pages/mediafiles/mediafiles-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { PermissionGuard } from 'src/app/site/guards/permission.guard'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { PermissionGuard } from '@app/site/guards/permission.guard'; import { OrganizationMediafileMainComponent } from './components/organization-mediafile-main/organization-mediafile-main.component'; diff --git a/client/src/app/site/pages/organization/pages/mediafiles/mediafiles.subscription.ts b/client/src/app/site/pages/organization/pages/mediafiles/mediafiles.subscription.ts index de31d2e591..594a0d7184 100644 --- a/client/src/app/site/pages/organization/pages/mediafiles/mediafiles.subscription.ts +++ b/client/src/app/site/pages/organization/pages/mediafiles/mediafiles.subscription.ts @@ -1,4 +1,4 @@ -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; import { ORGANIZATION_ID } from '../../services/organization.service'; import { ViewOrganization } from '../../view-models/view-organization'; diff --git a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/components/organization-mediafile-list/organization-mediafile-list.component.html b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/components/organization-mediafile-list/organization-mediafile-list.component.html index d0a3358439..e519700526 100644 --- a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/components/organization-mediafile-list/organization-mediafile-list.component.html +++ b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/components/organization-mediafile-list/organization-mediafile-list.component.html @@ -126,7 +126,7 @@

{{ 'Edit details for' | translate }}

mat-button type="submit" [disabled]="!fileEditForm?.valid" - [mat-dialog-close]="fileEditForm?.value" + [mat-dialog-close]="$safeNavigationMigration(fileEditForm?.value)" > {{ 'Save' | translate }} diff --git a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/components/organization-mediafile-list/organization-mediafile-list.component.ts b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/components/organization-mediafile-list/organization-mediafile-list.component.ts index 68ec84ec85..0312f7587a 100644 --- a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/components/organization-mediafile-list/organization-mediafile-list.component.ts +++ b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/components/organization-mediafile-list/organization-mediafile-list.component.ts @@ -9,20 +9,20 @@ import { } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { Mediafile } from '@app/domain/models/mediafiles/mediafile'; +import { LogoDisplayNames, LogoPlace } from '@app/domain/models/mediafiles/mediafile.constants'; +import { BaseListViewComponent } from '@app/site/base/base-list-view.component'; +import { ViewMediafile } from '@app/site/pages/meetings/pages/mediafiles'; +import { MediafileListExportService } from '@app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service'; +import { MediafileCommonService } from '@app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service'; +import { MediafileControllerService } from '@app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service'; +import { ORGANIZATION_SUBSCRIPTION } from '@app/site/pages/organization/organization.subscription'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { FileListComponent } from '@app/ui/modules/file-list/file-list.component'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { Mediafile } from 'src/app/domain/models/mediafiles/mediafile'; -import { LogoDisplayNames, LogoPlace } from 'src/app/domain/models/mediafiles/mediafile.constants'; -import { BaseListViewComponent } from 'src/app/site/base/base-list-view.component'; -import { ViewMediafile } from 'src/app/site/pages/meetings/pages/mediafiles'; -import { MediafileListExportService } from 'src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service'; -import { MediafileCommonService } from 'src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service'; -import { MediafileControllerService } from 'src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service'; -import { ORGANIZATION_SUBSCRIPTION } from 'src/app/site/pages/organization/organization.subscription'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { FileListComponent } from 'src/app/ui/modules/file-list/file-list.component'; import { ORGANIZATION_MEDIAFILE_LIST_SUBSCRIPTION } from '../../../../mediafiles.subscription'; diff --git a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/organization-mediafile-list.module.ts b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/organization-mediafile-list.module.ts index 9e217dbb2b..5d8d267c97 100644 --- a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/organization-mediafile-list.module.ts +++ b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-list/organization-mediafile-list.module.ts @@ -8,12 +8,12 @@ import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MediafileListServiceModule } from 'src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-service.module'; -import { MediafileCommonServiceModule } from 'src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common-service.module'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { FileListComponent } from 'src/app/ui/modules/file-list/file-list.component'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MediafileListServiceModule } from '@app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-service.module'; +import { MediafileCommonServiceModule } from '@app/site/pages/meetings/pages/mediafiles/services/mediafile-common-service.module'; +import { DirectivesModule } from '@app/ui/directives'; +import { FileListComponent } from '@app/ui/modules/file-list/file-list.component'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; import { OrganizationMediafileListComponent } from './components/organization-mediafile-list/organization-mediafile-list.component'; import { OrganizationMediafileListRoutingModule } from './organization-mediafile-list-routing.module'; diff --git a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-upload/components/organization-mediafile-upload/organization-mediafile-upload.component.ts b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-upload/components/organization-mediafile-upload/organization-mediafile-upload.component.ts index 1b80110beb..0d4df0bd0e 100644 --- a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-upload/components/organization-mediafile-upload/organization-mediafile-upload.component.ts +++ b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-upload/components/organization-mediafile-upload/organization-mediafile-upload.component.ts @@ -1,11 +1,11 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { Identifiable } from '@app/domain/interfaces'; +import { ViewMediafile } from '@app/site/pages/meetings/pages/mediafiles'; +import { MediafileCommonService } from '@app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service'; +import { MediafileControllerService } from '@app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service'; +import { UploadSuccessEvent } from '@app/ui/modules/media-upload-content/media-upload-content.component'; import { Observable } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ViewMediafile } from 'src/app/site/pages/meetings/pages/mediafiles'; -import { MediafileCommonService } from 'src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service'; -import { MediafileControllerService } from 'src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service'; -import { UploadSuccessEvent } from 'src/app/ui/modules/media-upload-content/media-upload-content.component'; @Component({ selector: `os-organization-mediafile-upload`, diff --git a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-upload/organization-mediafile-upload.module.ts b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-upload/organization-mediafile-upload.module.ts index 5fa8693eb4..1c2df2b36d 100644 --- a/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-upload/organization-mediafile-upload.module.ts +++ b/client/src/app/site/pages/organization/pages/mediafiles/modules/organization-mediafile-upload/organization-mediafile-upload.module.ts @@ -3,10 +3,10 @@ import { NgModule } from '@angular/core'; import { MatCardModule } from '@angular/material/card'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MediafileCommonServiceModule } from 'src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common-service.module'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { MediaUploadContentComponent } from 'src/app/ui/modules/media-upload-content/media-upload-content.component'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MediafileCommonServiceModule } from '@app/site/pages/meetings/pages/mediafiles/services/mediafile-common-service.module'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { MediaUploadContentComponent } from '@app/ui/modules/media-upload-content/media-upload-content.component'; import { OrganizationMediafileUploadComponent } from './components/organization-mediafile-upload/organization-mediafile-upload.component'; import { OrganizationMediafileUploadRoutingModule } from './organization-mediafile-upload-routing.module'; diff --git a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/components/meeting-list/meeting-list.component.html b/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/components/meeting-list/meeting-list.component.html index 70f29ad227..47952dc713 100644 --- a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/components/meeting-list/meeting-list.component.html +++ b/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/components/meeting-list/meeting-list.component.html @@ -118,7 +118,7 @@

Meetings

} @if (meeting.committee?.name) { - {{ meeting.committee?.name | translate }} + {{ $safeNavigationMigration(meeting.committee?.name) | translate }} }
@@ -176,7 +176,7 @@

Meetings

diff --git a/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/components/organization-tag-dialog.component.ts b/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/components/organization-tag-dialog.component.ts index 5d55991233..930c28d09d 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/components/organization-tag-dialog.component.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/components/organization-tag-dialog.component.ts @@ -1,7 +1,7 @@ -import { Component, Inject, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core'; import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { OrganizationTagDialogData } from '../services/organization-tag-dialog.service'; @@ -9,6 +9,7 @@ import { OrganizationTagDialogData } from '../services/organization-tag-dialog.s selector: `os-organization-tag-dialog`, templateUrl: `./organization-tag-dialog.component.html`, styleUrls: [`./organization-tag-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class OrganizationTagDialogComponent extends BaseUiComponent implements OnInit { diff --git a/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/organization-tag-dialog.module.ts b/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/organization-tag-dialog.module.ts index 047810f9b2..b650cb04ac 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/organization-tag-dialog.module.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/organization-tag-dialog.module.ts @@ -7,9 +7,9 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ChipComponent } from 'src/app/ui/modules/chip'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { ChipComponent } from '@app/ui/modules/chip'; import { OrganizationTagDialogComponent } from './components/organization-tag-dialog.component'; diff --git a/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/services/organization-tag-dialog.service.ts b/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/services/organization-tag-dialog.service.ts index 9be4f0a567..a706f23f88 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/services/organization-tag-dialog.service.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/modules/organization-tag-dialog/services/organization-tag-dialog.service.ts @@ -1,8 +1,8 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { HtmlColor } from 'src/app/domain/definitions/key-types'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { HtmlColor } from '@app/domain/definitions/key-types'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { ViewOrganizationTag } from '../../../view-models'; import { OrganizationTagDialogComponent } from '../components/organization-tag-dialog.component'; diff --git a/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.config.ts b/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.config.ts index 815c31fcfa..d44fb018ab 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.config.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.config.ts @@ -1,6 +1,6 @@ -import { OrganizationTag } from 'src/app/domain/models/organization-tags/organization-tag'; -import { OrganizationTagRepositoryService } from 'src/app/gateways/repositories/organization-tags'; -import { AppConfig } from 'src/app/infrastructure/definitions/app-config'; +import { OrganizationTag } from '@app/domain/models/organization-tags/organization-tag'; +import { OrganizationTagRepositoryService } from '@app/gateways/repositories/organization-tags'; +import { AppConfig } from '@app/infrastructure/definitions/app-config'; import { ViewOrganizationTag } from './view-models/view-organization-tag'; export const OrganizationTagsAppConfig: AppConfig = { diff --git a/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.module.ts b/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.module.ts index e243c54c6c..adfae16c91 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.module.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.module.ts @@ -7,11 +7,11 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { ChipComponent } from 'src/app/ui/modules/chip'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { ListModule } from 'src/app/ui/modules/list'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { ChipComponent } from '@app/ui/modules/chip'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { ListModule } from '@app/ui/modules/list'; import { OrganizationTagsRoutingModule } from './organization-tags-routing.module'; import { OrganizationTagMainModule } from './pages/organization-tag-main/organization-tag-main.module'; diff --git a/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.subscription.ts b/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.subscription.ts index f274cb0fc6..4dbee29ee4 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.subscription.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/organization-tags.subscription.ts @@ -1,6 +1,6 @@ -import { SubscriptionConfigGenerator } from 'src/app/domain/interfaces/subscription-config'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization'; +import { SubscriptionConfigGenerator } from '@app/domain/interfaces/subscription-config'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { ViewOrganization } from '@app/site/pages/organization/view-models/view-organization'; export const ORGANIZATION_TAG_LIST_SUBSCRIPTION = `organization_tag_list`; diff --git a/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/components/organization-tag-list/organization-tag-list.component.ts b/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/components/organization-tag-list/organization-tag-list.component.ts index fc7d5699e0..df29b4fca4 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/components/organization-tag-list/organization-tag-list.component.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/components/organization-tag-list/organization-tag-list.component.ts @@ -1,11 +1,11 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { BaseListViewComponent } from '@app/site/base/base-list-view.component'; +import { ColorService } from '@app/site/services/color.service'; +import { OperatorService } from '@app/site/services/operator.service'; +import { ThemeService } from '@app/site/services/theme.service'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom } from 'rxjs'; -import { BaseListViewComponent } from 'src/app/site/base/base-list-view.component'; -import { ColorService } from 'src/app/site/services/color.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { ThemeService } from 'src/app/site/services/theme.service'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { OrganizationTagDialogService } from '../../../../modules/organization-tag-dialog/services/organization-tag-dialog.service'; import { OrganizationTagControllerService } from '../../../../services/organization-tag-controller.service'; @@ -15,6 +15,7 @@ import { ViewOrganizationTag } from '../../../../view-models'; selector: `os-organization-tag-list`, templateUrl: `./organization-tag-list.component.html`, styleUrls: [`./organization-tag-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class OrganizationTagListComponent extends BaseListViewComponent { diff --git a/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/organization-tag-list.module.ts b/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/organization-tag-list.module.ts index 543e4c19fb..6fecb178a8 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/organization-tag-list.module.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-list/organization-tag-list.module.ts @@ -4,10 +4,10 @@ import { MatButtonModule } from '@angular/material/button'; import { MatDividerModule } from '@angular/material/divider'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { ChipComponent } from 'src/app/ui/modules/chip'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar/head-bar.module'; -import { ListModule } from 'src/app/ui/modules/list'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { ChipComponent } from '@app/ui/modules/chip'; +import { HeadBarModule } from '@app/ui/modules/head-bar/head-bar.module'; +import { ListModule } from '@app/ui/modules/list'; import { OrganizationTagDialogModule } from '../../modules/organization-tag-dialog/organization-tag-dialog.module'; import { OrganizationTagListComponent } from './components/organization-tag-list/organization-tag-list.component'; diff --git a/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-main/components/organization-tag-main/organization-tag-main.component.ts b/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-main/components/organization-tag-main/organization-tag-main.component.ts index 0dec4c3bf5..aac6239886 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-main/components/organization-tag-main/organization-tag-main.component.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/pages/organization-tag-main/components/organization-tag-main/organization-tag-main.component.ts @@ -1,8 +1,8 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { BaseModelRequestHandlerComponent, ModelRequestConfig -} from 'src/app/site/base/base-model-request-handler.component/base-model-request-handler.component'; +} from '@app/site/base/base-model-request-handler.component/base-model-request-handler.component'; import { getOrganizationTagListSubscriptionConfig } from '../../../../organization-tags.subscription'; @@ -10,6 +10,7 @@ import { getOrganizationTagListSubscriptionConfig } from '../../../../organizati selector: `os-organization-tag-main`, templateUrl: `./organization-tag-main.component.html`, styleUrls: [`./organization-tag-main.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class OrganizationTagMainComponent extends BaseModelRequestHandlerComponent { diff --git a/client/src/app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service/organization-tag-controller.service.ts b/client/src/app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service/organization-tag-controller.service.ts index 602900e65c..d9f94d06a5 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service/organization-tag-controller.service.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service/organization-tag-controller.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { OrganizationTag } from 'src/app/domain/models/organization-tags/organization-tag'; -import { OrganizationTagRepositoryService } from 'src/app/gateways/repositories/organization-tags/organization-tag-repository.service'; -import { BaseController } from 'src/app/site/base/base-controller'; -import { ControllerServiceCollectorService } from 'src/app/site/services/controller-service-collector.service'; +import { Identifiable } from '@app/domain/interfaces'; +import { OrganizationTag } from '@app/domain/models/organization-tags/organization-tag'; +import { OrganizationTagRepositoryService } from '@app/gateways/repositories/organization-tags/organization-tag-repository.service'; +import { BaseController } from '@app/site/base/base-controller'; +import { ControllerServiceCollectorService } from '@app/site/services/controller-service-collector.service'; import { ViewOrganizationTag } from '../../view-models'; diff --git a/client/src/app/site/pages/organization/pages/organization-tags/view-models/has-organization-tags.ts b/client/src/app/site/pages/organization/pages/organization-tags/view-models/has-organization-tags.ts index 6a686a5c0f..0969ae147d 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/view-models/has-organization-tags.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/view-models/has-organization-tags.ts @@ -1,4 +1,4 @@ -import { ViewModelRelations } from 'src/app/site/base/base-view-model'; +import { ViewModelRelations } from '@app/site/base/base-view-model'; import { HasOrganizationTagIds } from '../../../../../../domain/interfaces/has-organization-tag-ids'; import { ViewOrganizationTag } from './view-organization-tag'; diff --git a/client/src/app/site/pages/organization/pages/organization-tags/view-models/view-organization-tag.ts b/client/src/app/site/pages/organization/pages/organization-tags/view-models/view-organization-tag.ts index 39c7bb32a9..138a3ea20b 100644 --- a/client/src/app/site/pages/organization/pages/organization-tags/view-models/view-organization-tag.ts +++ b/client/src/app/site/pages/organization/pages/organization-tags/view-models/view-organization-tag.ts @@ -1,6 +1,6 @@ -import { OrganizationTag } from 'src/app/domain/models/organization-tags/organization-tag'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization'; +import { OrganizationTag } from '@app/domain/models/organization-tags/organization-tag'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { ViewOrganization } from '@app/site/pages/organization/view-models/view-organization'; import { HasOrganizationTags } from './has-organization-tags'; export class ViewOrganizationTag extends BaseViewModel { diff --git a/client/src/app/site/pages/organization/pages/resources/view-models/view-resource.ts b/client/src/app/site/pages/organization/pages/resources/view-models/view-resource.ts index 11905a4bba..8ac9139e5f 100644 --- a/client/src/app/site/pages/organization/pages/resources/view-models/view-resource.ts +++ b/client/src/app/site/pages/organization/pages/resources/view-models/view-resource.ts @@ -1,5 +1,5 @@ -import { Resource } from 'src/app/domain/models/resources/resource'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; +import { Resource } from '@app/domain/models/resources/resource'; +import { BaseViewModel } from '@app/site/base/base-view-model'; import { ViewOrganization } from '../../../view-models/view-organization'; diff --git a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.html b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.html index cfd94e9d7f..03f27e9b7f 100644 --- a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.html +++ b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.html @@ -1,6 +1,6 @@ @@ -43,7 +43,7 @@

{{ 'General' | translate }}

diff --git a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.ts b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.ts index 38c5f2e6a3..9d66c1d997 100644 --- a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.ts +++ b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/components/organization-settings/organization-settings.component.ts @@ -1,16 +1,16 @@ import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; +import { availableTranslations } from '@app/domain/definitions/languages'; +import { Selectable } from '@app/domain/interfaces'; +import { objectToFormattedString } from '@app/infrastructure/utils'; +import { createEmailValidator } from '@app/infrastructure/utils/validators/email'; +import { BaseComponent } from '@app/site/base/base.component'; +import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; +import { OrganizationControllerService } from '@app/site/pages/organization/services/organization-controller.service'; +import { ViewOrganization } from '@app/site/pages/organization/view-models/view-organization'; +import { OperatorService } from '@app/site/services/operator.service'; +import { TimeZoneService } from '@app/site/services/time-zone.service'; import { _ } from '@ngx-translate/core'; -import { availableTranslations } from 'src/app/domain/definitions/languages'; -import { Selectable } from 'src/app/domain/interfaces'; -import { objectToFormattedString } from 'src/app/infrastructure/utils'; -import { createEmailValidator } from 'src/app/infrastructure/utils/validators/email'; -import { BaseComponent } from 'src/app/site/base/base.component'; -import { ORGANIZATION_ID } from 'src/app/site/pages/organization/services/organization.service'; -import { OrganizationControllerService } from 'src/app/site/pages/organization/services/organization-controller.service'; -import { ViewOrganization } from 'src/app/site/pages/organization/view-models/view-organization'; -import { OperatorService } from 'src/app/site/services/operator.service'; -import { TimeZoneService } from 'src/app/site/services/time-zone.service'; @Component({ selector: `os-organization-settings`, @@ -23,7 +23,7 @@ export class OrganizationSettingsComponent extends BaseComponent { public readonly pageTitle = _(`Settings`); public readonly translations = availableTranslations; - public time_zones = signal([]); + public timeZones = signal([]); public orgaSettingsForm: UntypedFormGroup | null = null; @@ -145,7 +145,7 @@ export class OrganizationSettingsComponent extends BaseComponent { private async initTimezones(): Promise { this.timeZone.getTZForSearchSelector().then(values => { - this.time_zones.set(values); + this.timeZones.set(values); this.patchTimezoneInForm(); }); } diff --git a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/settings-detail.module.ts b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/settings-detail.module.ts index 9eb79e668b..c2ecbea935 100644 --- a/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/settings-detail.module.ts +++ b/client/src/app/site/pages/organization/pages/settings/modules/settings-detail/settings-detail.module.ts @@ -6,10 +6,10 @@ import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { HeadBarModule } from 'src/app/ui/modules/head-bar'; -import { SearchSelectorModule } from 'src/app/ui/modules/search-selector'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { HeadBarModule } from '@app/ui/modules/head-bar'; +import { SearchSelectorModule } from '@app/ui/modules/search-selector'; import { OrganizationSettingsComponent } from './components/organization-settings/organization-settings.component'; import { SettingsDetailRoutingModule } from './settings-detail-routing.module'; diff --git a/client/src/app/site/pages/organization/services/organization-settings.service.ts b/client/src/app/site/pages/organization/services/organization-settings.service.ts index f09e541d55..c04e51f229 100644 --- a/client/src/app/site/pages/organization/services/organization-settings.service.ts +++ b/client/src/app/site/pages/organization/services/organization-settings.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; +import { OrganizationRepositoryService } from '@app/gateways/repositories/organization-repository.service'; import { BehaviorSubject, combineLatest, filter, map, Observable } from 'rxjs'; -import { OrganizationRepositoryService } from 'src/app/gateways/repositories/organization-repository.service'; import { OrganizationSetting } from '../../../../domain/models/organizations/organization'; import { ViewOrganization } from '../view-models/view-organization'; diff --git a/client/src/app/site/pages/organization/services/organization.service.ts b/client/src/app/site/pages/organization/services/organization.service.ts index fe8f85cd27..0e79306deb 100644 --- a/client/src/app/site/pages/organization/services/organization.service.ts +++ b/client/src/app/site/pages/organization/services/organization.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; +import { ModelRequestService } from '@app/site/services/model-request.service'; import { BehaviorSubject, Observable } from 'rxjs'; -import { ModelRequestService } from 'src/app/site/services/model-request.service'; import { OrganizationRepositoryService } from '../../../../gateways/repositories/organization-repository.service'; import { ModelSubscription } from '../../../services/autoupdate'; diff --git a/client/src/app/site/pages/organization/view-models/view-organization.ts b/client/src/app/site/pages/organization/view-models/view-organization.ts index 227d7f941b..9665e9129f 100644 --- a/client/src/app/site/pages/organization/view-models/view-organization.ts +++ b/client/src/app/site/pages/organization/view-models/view-organization.ts @@ -1,4 +1,4 @@ -import { Organization } from 'src/app/domain/models/organizations/organization'; +import { Organization } from '@app/domain/models/organizations/organization'; import { BaseViewModel, ViewModelRelations } from '../../../base/base-view-model'; import { ViewMediafile } from '../../meetings/pages/mediafiles'; diff --git a/client/src/app/site/services/active-filters.service.spec.ts b/client/src/app/site/services/active-filters.service.spec.ts index f8fb9688a5..73ab076705 100644 --- a/client/src/app/site/services/active-filters.service.spec.ts +++ b/client/src/app/site/services/active-filters.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { StorageService } from 'src/app/gateways/storage.service'; +import { StorageService } from '@app/gateways/storage.service'; import { OsFilter } from '../base/base-filter.service'; import { ActiveFiltersService } from './active-filters.service'; diff --git a/client/src/app/site/services/active-filters.service.ts b/client/src/app/site/services/active-filters.service.ts index defd3175c5..040294110a 100644 --- a/client/src/app/site/services/active-filters.service.ts +++ b/client/src/app/site/services/active-filters.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { StorageService } from 'src/app/gateways/storage.service'; -import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { ActiveFiltersStoreService } from 'src/app/ui/modules/list/definitions'; +import { StorageService } from '@app/gateways/storage.service'; +import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { ActiveFiltersStoreService } from '@app/ui/modules/list/definitions'; import { OsFilter } from '../base/base-filter.service'; diff --git a/client/src/app/site/services/auth-check.service.ts b/client/src/app/site/services/auth-check.service.ts index 3b92d1070f..d4e71f59ca 100644 --- a/client/src/app/site/services/auth-check.service.ts +++ b/client/src/app/site/services/auth-check.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { Data } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { CML, OML } from '@app/domain/definitions/organization-permission'; +import { Permission } from '@app/domain/definitions/permission'; +import { Settings } from '@app/domain/models/meetings/meeting'; +import { MeetingRepositoryService } from '@app/gateways/repositories/meeting-repository.service'; import { CookieService } from 'ngx-cookie-service'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { CML, OML } from 'src/app/domain/definitions/organization-permission'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { Settings } from 'src/app/domain/models/meetings/meeting'; -import { MeetingRepositoryService } from 'src/app/gateways/repositories/meeting-repository.service'; import { ActiveMeetingService } from '../pages/meetings/services/active-meeting.service'; import { MeetingSettingsService } from '../pages/meetings/services/meeting-settings.service'; diff --git a/client/src/app/site/services/auth.service.ts b/client/src/app/site/services/auth.service.ts index 04c9aa24a0..40a27997d4 100644 --- a/client/src/app/site/services/auth.service.ts +++ b/client/src/app/site/services/auth.service.ts @@ -1,8 +1,8 @@ import { EventEmitter, Injectable } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; +import { SharedWorkerService } from '@app/openslides-main-module/services/shared-worker.service'; import { CookieService } from 'ngx-cookie-service'; import { BehaviorSubject, Observable } from 'rxjs'; -import { SharedWorkerService } from 'src/app/openslides-main-module/services/shared-worker.service'; import { AuthToken } from '../../domain/interfaces/auth-token'; import { AuthAdapterService } from '../../gateways/auth-adapter.service'; diff --git a/client/src/app/site/services/autoupdate/autoupdate-communication.service.ts b/client/src/app/site/services/autoupdate/autoupdate-communication.service.ts index 67dc5d302f..43244e1ffa 100644 --- a/client/src/app/site/services/autoupdate/autoupdate-communication.service.ts +++ b/client/src/app/site/services/autoupdate/autoupdate-communication.service.ts @@ -1,14 +1,12 @@ import { Injectable } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { TranslateService } from '@ngx-translate/core'; -import { Observable, Subscriber } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { ModelRequest } from 'src/app/domain/interfaces/model-request'; -import { HttpStreamEndpointService } from 'src/app/gateways/http-stream'; -import { formatQueryParams } from 'src/app/infrastructure/definitions/http'; -import { djb2hash } from 'src/app/infrastructure/utils'; -import { fqidFromCollectionAndId } from 'src/app/infrastructure/utils/transform-functions'; -import { SharedWorkerService } from 'src/app/openslides-main-module/services/shared-worker.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { ModelRequest } from '@app/domain/interfaces/model-request'; +import { HttpStreamEndpointService } from '@app/gateways/http-stream'; +import { formatQueryParams } from '@app/infrastructure/definitions/http'; +import { djb2hash } from '@app/infrastructure/utils'; +import { fqidFromCollectionAndId } from '@app/infrastructure/utils/transform-functions'; +import { SharedWorkerService } from '@app/openslides-main-module/services/shared-worker.service'; import { AutoupdateCleanupCache, AutoupdateCloseStream, @@ -21,7 +19,9 @@ import { AutoupdateSetEndpoint, AutoupdateSetStreamId, AutoupdateStatus -} from 'src/app/worker/autoupdate/interfaces-autoupdate'; +} from '@app/worker/autoupdate/interfaces-autoupdate'; +import { TranslateService } from '@ngx-translate/core'; +import { Observable, Subscriber } from 'rxjs'; import { GlobalHeadbarService } from '../../modules/global-headbar/global-headbar.service'; import { SpinnerService } from '../../modules/global-spinner'; diff --git a/client/src/app/site/services/autoupdate/autoupdate.service.ts b/client/src/app/site/services/autoupdate/autoupdate.service.ts index f86e05bac7..7d8d143afc 100644 --- a/client/src/app/site/services/autoupdate/autoupdate.service.ts +++ b/client/src/app/site/services/autoupdate/autoupdate.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; +import { ModelRequest } from '@app/domain/interfaces/model-request'; import { _ } from '@ngx-translate/core'; -import { ModelRequest } from 'src/app/domain/interfaces/model-request'; import { Collection, Id, Ids } from '../../../domain/definitions/key-types'; import { HttpStreamEndpointService } from '../../../gateways/http-stream'; diff --git a/client/src/app/site/services/collection-mapper.service/collection-mapper.service.ts b/client/src/app/site/services/collection-mapper.service/collection-mapper.service.ts index f36dce9df6..e886e29037 100644 --- a/client/src/app/site/services/collection-mapper.service/collection-mapper.service.ts +++ b/client/src/app/site/services/collection-mapper.service/collection-mapper.service.ts @@ -1,8 +1,8 @@ import { EventEmitter, Injectable } from '@angular/core'; +import { BaseModel, ModelConstructor } from '@app/domain/models/base/base-model'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { BaseViewModel, ViewModelConstructor } from '@app/site/base/base-view-model'; import { BehaviorSubject, Observable } from 'rxjs'; -import { BaseModel, ModelConstructor } from 'src/app/domain/models/base/base-model'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { BaseViewModel, ViewModelConstructor } from 'src/app/site/base/base-view-model'; import { CollectionMapper } from './collection-mapper'; import { CollectionMappedTypes, CollectionType } from './definitions'; diff --git a/client/src/app/site/services/collection-mapper.service/collection-mapper.ts b/client/src/app/site/services/collection-mapper.service/collection-mapper.ts index 31432784a9..a890b9792f 100644 --- a/client/src/app/site/services/collection-mapper.service/collection-mapper.ts +++ b/client/src/app/site/services/collection-mapper.service/collection-mapper.ts @@ -1,7 +1,7 @@ -import { Collection } from 'src/app/domain/definitions/key-types'; -import { BaseModel, ModelConstructor } from 'src/app/domain/models/base/base-model'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { BaseViewModel, ViewModelConstructor } from 'src/app/site/base/base-view-model'; +import { Collection } from '@app/domain/definitions/key-types'; +import { BaseModel, ModelConstructor } from '@app/domain/models/base/base-model'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { BaseViewModel, ViewModelConstructor } from '@app/site/base/base-view-model'; import { CollectionType } from './definitions'; export interface CollectionMapper { diff --git a/client/src/app/site/services/collection-mapper.service/definitions.ts b/client/src/app/site/services/collection-mapper.service/definitions.ts index 81b1920e67..d91fc88531 100644 --- a/client/src/app/site/services/collection-mapper.service/definitions.ts +++ b/client/src/app/site/services/collection-mapper.service/definitions.ts @@ -1,6 +1,6 @@ -import { BaseModel, ModelConstructor } from 'src/app/domain/models/base/base-model'; -import { BaseRepository } from 'src/app/gateways/repositories/base-repository'; -import { BaseViewModel, ViewModelConstructor } from 'src/app/site/base/base-view-model'; +import { BaseModel, ModelConstructor } from '@app/domain/models/base/base-model'; +import { BaseRepository } from '@app/gateways/repositories/base-repository'; +import { BaseViewModel, ViewModelConstructor } from '@app/site/base/base-view-model'; /** * Unifies the ModelConstructor and ViewModelConstructor. */ diff --git a/client/src/app/site/services/data-store.service.ts b/client/src/app/site/services/data-store.service.ts index 879dd14fdf..3950dedc70 100644 --- a/client/src/app/site/services/data-store.service.ts +++ b/client/src/app/site/services/data-store.service.ts @@ -1,6 +1,6 @@ import { EventEmitter, Injectable } from '@angular/core'; +import { Collection, Ids } from '@app/domain/definitions/key-types'; import { Observable, Subject } from 'rxjs'; -import { Collection, Ids } from 'src/app/domain/definitions/key-types'; import { BaseModel, ModelConstructor } from '../../domain/models/base/base-model'; import { CollectionMapperService } from './collection-mapper.service'; diff --git a/client/src/app/site/services/fallback-routes.service.ts b/client/src/app/site/services/fallback-routes.service.ts index 4a707cc502..de0416c41b 100644 --- a/client/src/app/site/services/fallback-routes.service.ts +++ b/client/src/app/site/services/fallback-routes.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Permission } from 'src/app/domain/definitions/permission'; +import { Permission } from '@app/domain/definitions/permission'; import { OperatorService } from './operator.service'; diff --git a/client/src/app/site/services/global-search/definitions.ts b/client/src/app/site/services/global-search/definitions.ts index b95a7d304b..90af575af6 100644 --- a/client/src/app/site/services/global-search/definitions.ts +++ b/client/src/app/site/services/global-search/definitions.ts @@ -1,4 +1,4 @@ -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; export interface GlobalSearchEntry { title: string; diff --git a/client/src/app/site/services/global-search/global-search.service.ts b/client/src/app/site/services/global-search/global-search.service.ts index 65f57b3d1d..97c1d5b4e0 100644 --- a/client/src/app/site/services/global-search/global-search.service.ts +++ b/client/src/app/site/services/global-search/global-search.service.ts @@ -1,16 +1,16 @@ import { Injectable } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; -import { Fqid, Id } from 'src/app/domain/definitions/key-types'; -import { Meeting } from 'src/app/domain/models/meetings/meeting'; -import { Motion } from 'src/app/domain/models/motions'; -import { MotionChangeRecommendation } from 'src/app/domain/models/motions/motion-change-recommendation'; -import { HttpService } from 'src/app/gateways/http.service'; +import { Fqid, Id } from '@app/domain/definitions/key-types'; +import { Meeting } from '@app/domain/models/meetings/meeting'; +import { Motion } from '@app/domain/models/motions'; +import { MotionChangeRecommendation } from '@app/domain/models/motions/motion-change-recommendation'; +import { HttpService } from '@app/gateways/http.service'; import { collectionFromFqid, collectionIdFromFqid, fqidFromCollectionAndId, idFromFqid -} from 'src/app/infrastructure/utils/transform-functions'; +} from '@app/infrastructure/utils/transform-functions'; +import { TranslateService } from '@ngx-translate/core'; import { ActiveMeetingService } from '../../pages/meetings/services/active-meeting.service'; import { GlobalSearchEntry, GlobalSearchResponse, GlobalSearchResponseEntry } from './definitions'; diff --git a/client/src/app/site/services/lifecycle.service.spec.ts b/client/src/app/site/services/lifecycle.service.spec.ts index 10245734c7..27fd822a30 100644 --- a/client/src/app/site/services/lifecycle.service.spec.ts +++ b/client/src/app/site/services/lifecycle.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { StorageService } from 'src/app/gateways/storage.service'; +import { StorageService } from '@app/gateways/storage.service'; import { LifecycleService } from './lifecycle.service'; diff --git a/client/src/app/site/services/lifecycle.service.ts b/client/src/app/site/services/lifecycle.service.ts index 34a7c2836f..b0288a955b 100644 --- a/client/src/app/site/services/lifecycle.service.ts +++ b/client/src/app/site/services/lifecycle.service.ts @@ -1,6 +1,6 @@ import { EventEmitter, Injectable } from '@angular/core'; -import { StorageService } from 'src/app/gateways/storage.service'; -import { Deferred } from 'src/app/infrastructure/utils/promises'; +import { StorageService } from '@app/gateways/storage.service'; +import { Deferred } from '@app/infrastructure/utils/promises'; @Injectable({ providedIn: `root` diff --git a/client/src/app/site/services/model-request-builder/model-request-builder.service.ts b/client/src/app/site/services/model-request-builder/model-request-builder.service.ts index 177ca20bf4..c5a35ff373 100644 --- a/client/src/app/site/services/model-request-builder/model-request-builder.service.ts +++ b/client/src/app/site/services/model-request-builder/model-request-builder.service.ts @@ -4,7 +4,7 @@ import { Fields, GenericRelationFieldDecriptor, RelationFieldDescriptor -} from 'src/app/domain/interfaces/model-request'; +} from '@app/domain/interfaces/model-request'; import { Collection, Field, Id } from '../../../domain/definitions/key-types'; import { BaseModel } from '../../../domain/models/base/base-model'; diff --git a/client/src/app/site/services/model-request-builder/model-request-object.ts b/client/src/app/site/services/model-request-builder/model-request-object.ts index a94a65d1f0..8be391a58f 100644 --- a/client/src/app/site/services/model-request-builder/model-request-object.ts +++ b/client/src/app/site/services/model-request-builder/model-request-object.ts @@ -1,4 +1,4 @@ -import { FieldDescriptor, Fields, ModelRequest } from 'src/app/domain/interfaces/model-request'; +import { FieldDescriptor, Fields, ModelRequest } from '@app/domain/interfaces/model-request'; import { Collection, Id } from '../../../domain/definitions/key-types'; import { BaseSimplifiedModelRequest } from './model-request-builder.service'; diff --git a/client/src/app/site/services/model-request.service.ts b/client/src/app/site/services/model-request.service.ts index dfdcfb1469..8ef60510cf 100644 --- a/client/src/app/site/services/model-request.service.ts +++ b/client/src/app/site/services/model-request.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; +import { isValidId } from '@app/infrastructure/utils'; +import { ModelRequestBuilderService } from '@app/site/services/model-request-builder'; import { filter, first, Observable, Subscription } from 'rxjs'; -import { isValidId } from 'src/app/infrastructure/utils'; -import { ModelRequestBuilderService } from 'src/app/site/services/model-request-builder'; import { AU_PAUSE_ON_INACTIVITY_TIMEOUT, AutoupdateService, ModelSubscription } from './autoupdate'; import { ModelData } from './autoupdate/utils'; diff --git a/client/src/app/site/services/openslides-router.service.ts b/client/src/app/site/services/openslides-router.service.ts index 44594a7886..5b2073d3b0 100644 --- a/client/src/app/site/services/openslides-router.service.ts +++ b/client/src/app/site/services/openslides-router.service.ts @@ -8,6 +8,12 @@ import { RoutesRecognized, UrlTree } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { + ActiveMeetingIdService, + MeetingIdChangedEvent +} from '@app/site/pages/meetings/services/active-meeting-id.service'; +import { AuthService } from '@app/site/services/auth.service'; import { BehaviorSubject, distinctUntilChanged, @@ -19,12 +25,6 @@ import { Subject, tap } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { - ActiveMeetingIdService, - MeetingIdChangedEvent -} from 'src/app/site/pages/meetings/services/active-meeting-id.service'; -import { AuthService } from 'src/app/site/services/auth.service'; import { UpdateService } from '../modules/site-wrapper/services/update.service'; import { OperatorService } from './operator.service'; diff --git a/client/src/app/site/services/openslides-status.service.spec.ts b/client/src/app/site/services/openslides-status.service.spec.ts index acafab4178..b4caf6244a 100644 --- a/client/src/app/site/services/openslides-status.service.spec.ts +++ b/client/src/app/site/services/openslides-status.service.spec.ts @@ -1,5 +1,5 @@ import { TestBed } from '@angular/core/testing'; -import { Deferred } from 'src/app/infrastructure/utils/promises'; +import { Deferred } from '@app/infrastructure/utils/promises'; import { OpenSlidesStatusService } from './openslides-status.service'; diff --git a/client/src/app/site/services/openslides-status.service.ts b/client/src/app/site/services/openslides-status.service.ts index f20208af35..0692995c71 100644 --- a/client/src/app/site/services/openslides-status.service.ts +++ b/client/src/app/site/services/openslides-status.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; +import { Deferred } from '@app/infrastructure/utils/promises'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Deferred } from 'src/app/infrastructure/utils/promises'; @Injectable({ providedIn: `root` diff --git a/client/src/app/site/services/operator.service.ts b/client/src/app/site/services/operator.service.ts index 755a84d527..584d9de1ef 100644 --- a/client/src/app/site/services/operator.service.ts +++ b/client/src/app/site/services/operator.service.ts @@ -1,4 +1,12 @@ import { Injectable } from '@angular/core'; +import { DelegationSetting, delegationSettings } from '@app/domain/definitions/delegation-setting'; +import { UserFieldsets } from '@app/domain/fieldsets/user'; +import { Settings } from '@app/domain/models/meetings/meeting'; +import { User } from '@app/domain/models/users/user'; +import { MeetingUserRepositoryService } from '@app/gateways/repositories/meeting_user'; +import { UserRepositoryService } from '@app/gateways/repositories/users'; +import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; +import { ModelRequestBuilderService } from '@app/site/services/model-request-builder'; import { BehaviorSubject, combineLatest, @@ -8,14 +16,6 @@ import { startWith, Subject } from 'rxjs'; -import { DelegationSetting, delegationSettings } from 'src/app/domain/definitions/delegation-setting'; -import { UserFieldsets } from 'src/app/domain/fieldsets/user'; -import { Settings } from 'src/app/domain/models/meetings/meeting'; -import { User } from 'src/app/domain/models/users/user'; -import { MeetingUserRepositoryService } from 'src/app/gateways/repositories/meeting_user'; -import { UserRepositoryService } from 'src/app/gateways/repositories/users'; -import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user'; -import { ModelRequestBuilderService } from 'src/app/site/services/model-request-builder'; import { Id } from '../../domain/definitions/key-types'; import { CML, cmlNameMapping, OML, omlNameMapping } from '../../domain/definitions/organization-permission'; diff --git a/client/src/app/site/services/reroute.service.ts b/client/src/app/site/services/reroute.service.ts index c502a6d57a..c3a67b87a4 100644 --- a/client/src/app/site/services/reroute.service.ts +++ b/client/src/app/site/services/reroute.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { Data, Router, UrlSegment, UrlTree } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; import { firstValueFrom } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; import { FallbackRoutesService } from './fallback-routes.service'; import { OpenSlidesRouterService } from './openslides-router.service'; diff --git a/client/src/app/site/services/theme.service.spec.ts b/client/src/app/site/services/theme.service.spec.ts index 01173861dd..6633a915f9 100644 --- a/client/src/app/site/services/theme.service.spec.ts +++ b/client/src/app/site/services/theme.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; +import { ThemeRepositoryService } from '@app/gateways/repositories/themes/theme-repository.service'; +import { StorageService } from '@app/gateways/storage.service'; import { Observable } from 'rxjs'; -import { ThemeRepositoryService } from 'src/app/gateways/repositories/themes/theme-repository.service'; -import { StorageService } from 'src/app/gateways/storage.service'; import { OrganizationSettingsService } from '../pages/organization/services/organization-settings.service'; import { ColorService } from './color.service'; diff --git a/client/src/app/site/services/theme.service.ts b/client/src/app/site/services/theme.service.ts index 93391e3027..688dcdda10 100644 --- a/client/src/app/site/services/theme.service.ts +++ b/client/src/app/site/services/theme.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { ThemePalette } from '@angular/material/core'; +import { ThemeRepositoryService } from '@app/gateways/repositories/themes/theme-repository.service'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import { ThemeRepositoryService } from 'src/app/gateways/repositories/themes/theme-repository.service'; import { HtmlColor, Id } from '../../domain/definitions/key-types'; import { ThemeGeneralColors, ThemeRequiredValues } from '../../domain/models/theme/theme'; diff --git a/client/src/app/site/services/time-zone.service.ts b/client/src/app/site/services/time-zone.service.ts index f2451f95ce..8c97606578 100644 --- a/client/src/app/site/services/time-zone.service.ts +++ b/client/src/app/site/services/time-zone.service.ts @@ -1,8 +1,8 @@ import { inject, Injectable } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Selectable } from '@app/domain/interfaces'; +import { GetValidTimezonesPresenterService } from '@app/gateways/presenter/get-valid-timezones'; import { TZDate } from '@date-fns/tz'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Selectable } from 'src/app/domain/interfaces'; -import { GetValidTimezonesPresenterService } from 'src/app/gateways/presenter/get-valid-timezones'; import { ActiveMeetingService } from '../pages/meetings/services/active-meeting.service'; import { ORGANIZATION_ID } from '../pages/organization/services/organization.service'; diff --git a/client/src/app/site/services/user-controller.service.ts b/client/src/app/site/services/user-controller.service.ts index 2136365953..4dfc8e863c 100644 --- a/client/src/app/site/services/user-controller.service.ts +++ b/client/src/app/site/services/user-controller.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { GetActiveUsersAmountPresenterService } from 'src/app/gateways/presenter'; +import { Id } from '@app/domain/definitions/key-types'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { GetActiveUsersAmountPresenterService } from '@app/gateways/presenter'; import { AssignMeetingsPayload, AssignMeetingsResult, @@ -11,8 +10,9 @@ import { ShortNameInformation, UserPatchFn, UserRepositoryService -} from 'src/app/gateways/repositories/users'; -import { OperatorService } from 'src/app/site/services/operator.service'; +} from '@app/gateways/repositories/users'; +import { OperatorService } from '@app/site/services/operator.service'; +import { Observable } from 'rxjs'; import { Identifiable } from '../../domain/interfaces'; import { User } from '../../domain/models/users/user'; diff --git a/client/src/app/site/services/user.service.ts b/client/src/app/site/services/user.service.ts index e61e612574..3b4f4dd3c6 100644 --- a/client/src/app/site/services/user.service.ts +++ b/client/src/app/site/services/user.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { CML, OML } from 'src/app/domain/definitions/organization-permission'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { GetUserEditablePresenterService, GetUserScopePresenterService } from 'src/app/gateways/presenter'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; +import { Id } from '@app/domain/definitions/key-types'; +import { CML, OML } from '@app/domain/definitions/organization-permission'; +import { Permission } from '@app/domain/definitions/permission'; +import { GetUserEditablePresenterService, GetUserScopePresenterService } from '@app/gateways/presenter'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { MeetingControllerService } from '../pages/meetings/services/meeting-controller.service'; diff --git a/client/src/app/site/services/view-model-store-update.service.ts b/client/src/app/site/services/view-model-store-update.service.ts index ceb5294a7d..3414710d72 100644 --- a/client/src/app/site/services/view-model-store-update.service.ts +++ b/client/src/app/site/services/view-model-store-update.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { Collection, Id, Ids } from 'src/app/domain/definitions/key-types'; -import { BaseModel, BaseModelTemplate } from 'src/app/domain/models/base/base-model'; -import { CollectionMapperService } from 'src/app/site/services/collection-mapper.service'; -import { DataStoreService } from 'src/app/site/services/data-store.service'; -import { DataStoreUpdateManagerService } from 'src/app/site/services/data-store-update-manager.service'; +import { Collection, Id, Ids } from '@app/domain/definitions/key-types'; +import { BaseModel, BaseModelTemplate } from '@app/domain/models/base/base-model'; +import { CollectionMapperService } from '@app/site/services/collection-mapper.service'; +import { DataStoreService } from '@app/site/services/data-store.service'; +import { DataStoreUpdateManagerService } from '@app/site/services/data-store-update-manager.service'; type DeletedModels = Record; export type ChangedModels = Record; diff --git a/client/src/app/ui/base/base-sort-tree-view-component.ts b/client/src/app/ui/base/base-sort-tree-view-component.ts index f636747e51..61cb5bf7b1 100644 --- a/client/src/app/ui/base/base-sort-tree-view-component.ts +++ b/client/src/app/ui/base/base-sort-tree-view-component.ts @@ -1,10 +1,10 @@ import { Directive, EventEmitter, inject, ViewChild } from '@angular/core'; +import { SortDefinition } from '@app/site/base/base-sort.service'; +import { BaseViewModel } from '@app/site/base/base-view-model'; +import { CanComponentDeactivate } from '@app/site/guards/watch-for-changes.guard'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; -import { SortDefinition } from 'src/app/site/base/base-sort.service'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; -import { CanComponentDeactivate } from 'src/app/site/guards/watch-for-changes.guard'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { SortingTreeComponent } from '../modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component'; diff --git a/client/src/app/ui/base/base-ui-component.ts b/client/src/app/ui/base/base-ui-component.ts index 13aad8088b..204251bbb7 100644 --- a/client/src/app/ui/base/base-ui-component.ts +++ b/client/src/app/ui/base/base-ui-component.ts @@ -1,8 +1,8 @@ import { Directive, OnDestroy } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { SubscriptionMap } from '@app/infrastructure/utils/subscription-map'; import { Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { SubscriptionMap } from 'src/app/infrastructure/utils/subscription-map'; @Directive() export class BaseUiComponent implements OnDestroy { diff --git a/client/src/app/ui/base/import-service.ts b/client/src/app/ui/base/import-service.ts index 89793d76b2..82b93491db 100644 --- a/client/src/app/ui/base/import-service.ts +++ b/client/src/app/ui/base/import-service.ts @@ -1,8 +1,8 @@ +import { Identifiable } from '@app/domain/interfaces'; +import { ImportModel } from '@app/infrastructure/utils/import/import-model'; +import { ImportStep } from '@app/infrastructure/utils/import/import-step'; +import { ValueLabelCombination } from '@app/infrastructure/utils/import/import-utils'; import { Observable } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ImportModel } from 'src/app/infrastructure/utils/import/import-model'; -import { ImportStep } from 'src/app/infrastructure/utils/import/import-step'; -import { ValueLabelCombination } from 'src/app/infrastructure/utils/import/import-utils'; import { BackendImportPhase } from '../modules/import-list/components/via-backend-import-list/backend-import-list.component'; import { BackendImportPreview } from '../modules/import-list/definitions/backend-import-preview'; diff --git a/client/src/app/ui/base/view-model-list-provider.ts b/client/src/app/ui/base/view-model-list-provider.ts index 86850150f3..c240a10ee8 100644 --- a/client/src/app/ui/base/view-model-list-provider.ts +++ b/client/src/app/ui/base/view-model-list-provider.ts @@ -1,5 +1,5 @@ +import { Identifiable } from '@app/domain/interfaces'; import { Observable } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; export interface ViewModelListProvider { getViewModelListObservable(): Observable; diff --git a/client/src/app/ui/directives/autofocus/autofocus.directive.spec.ts b/client/src/app/ui/directives/autofocus/autofocus.directive.spec.ts index 0d88b6f27d..fbd3e87fb8 100644 --- a/client/src/app/ui/directives/autofocus/autofocus.directive.spec.ts +++ b/client/src/app/ui/directives/autofocus/autofocus.directive.spec.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; @@ -8,6 +8,7 @@ import { AutofocusDirective } from './autofocus.directive'; template: ` `, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) class TestComponent {} diff --git a/client/src/app/ui/directives/meeting-setting/meeting-setting.directive.spec.ts b/client/src/app/ui/directives/meeting-setting/meeting-setting.directive.spec.ts index 3e6ba0f77f..9cbd0b695e 100644 --- a/client/src/app/ui/directives/meeting-setting/meeting-setting.directive.spec.ts +++ b/client/src/app/ui/directives/meeting-setting/meeting-setting.directive.spec.ts @@ -1,9 +1,9 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { Settings } from '@app/domain/models/meetings/meeting'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Settings } from 'src/app/domain/models/meetings/meeting'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; import { MeetingSettingDirective } from './meeting-setting.directive'; @@ -40,6 +40,7 @@ class MockMeetingSettingsService {
`, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) class TestComponent { diff --git a/client/src/app/ui/directives/meeting-setting/meeting-setting.directive.ts b/client/src/app/ui/directives/meeting-setting/meeting-setting.directive.ts index 70b777cbae..47f844e0f5 100644 --- a/client/src/app/ui/directives/meeting-setting/meeting-setting.directive.ts +++ b/client/src/app/ui/directives/meeting-setting/meeting-setting.directive.ts @@ -1,7 +1,7 @@ import { Directive, EmbeddedViewRef, inject, Input, TemplateRef, ViewContainerRef } from '@angular/core'; -import { Settings } from 'src/app/domain/models/meetings/meeting'; -import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; +import { Settings } from '@app/domain/models/meetings/meeting'; +import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; const SUBSCRIPTION_NAME = `settingsSubscription`; diff --git a/client/src/app/ui/directives/perms/base-perms.directive.ts b/client/src/app/ui/directives/perms/base-perms.directive.ts index f8ed668932..8a0dbd9cc1 100644 --- a/client/src/app/ui/directives/perms/base-perms.directive.ts +++ b/client/src/app/ui/directives/perms/base-perms.directive.ts @@ -1,6 +1,6 @@ import { Directive, EmbeddedViewRef, OnDestroy, OnInit, TemplateRef, ViewContainerRef } from '@angular/core'; +import { OperatorService } from '@app/site/services/operator.service'; import { Subscription } from 'rxjs'; -import { OperatorService } from 'src/app/site/services/operator.service'; @Directive() export abstract class BasePermsDirective

implements OnInit, OnDestroy { diff --git a/client/src/app/ui/directives/perms/cml-perms.directive.spec.ts b/client/src/app/ui/directives/perms/cml-perms.directive.spec.ts index 508351ffc5..625301caf4 100644 --- a/client/src/app/ui/directives/perms/cml-perms.directive.spec.ts +++ b/client/src/app/ui/directives/perms/cml-perms.directive.spec.ts @@ -1,10 +1,10 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { Id } from '@app/domain/definitions/key-types'; +import { CML, OML } from '@app/domain/definitions/organization-permission'; +import { OperatorService } from '@app/site/services/operator.service'; import { Observable, Subject } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { CML, OML } from 'src/app/domain/definitions/organization-permission'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { CmlPermsDirective } from './cml-perms.directive'; import { BasePermsTestComponent } from './perms.directive.spec'; @@ -36,6 +36,7 @@ interface TestConditionalType {

`, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) class TestComponent extends BasePermsTestComponent { diff --git a/client/src/app/ui/directives/perms/cml-perms.directive.ts b/client/src/app/ui/directives/perms/cml-perms.directive.ts index 9b13bdef15..b21be877d3 100644 --- a/client/src/app/ui/directives/perms/cml-perms.directive.ts +++ b/client/src/app/ui/directives/perms/cml-perms.directive.ts @@ -1,6 +1,6 @@ import { Directive, Input, TemplateRef } from '@angular/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { CML, OML } from 'src/app/domain/definitions/organization-permission'; +import { Id } from '@app/domain/definitions/key-types'; +import { CML, OML } from '@app/domain/definitions/organization-permission'; import { BasePermsDirective } from './base-perms.directive'; diff --git a/client/src/app/ui/directives/perms/oml-perms.directive.spec.ts b/client/src/app/ui/directives/perms/oml-perms.directive.spec.ts index 3a46988285..d3b821013d 100644 --- a/client/src/app/ui/directives/perms/oml-perms.directive.spec.ts +++ b/client/src/app/ui/directives/perms/oml-perms.directive.spec.ts @@ -1,9 +1,9 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { OML } from '@app/domain/definitions/organization-permission'; +import { OperatorService } from '@app/site/services/operator.service'; import { Observable, Subject } from 'rxjs'; -import { OML } from 'src/app/domain/definitions/organization-permission'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { OmlPermsDirective } from './oml-perms.directive'; import { BasePermsTestComponent } from './perms.directive.spec'; @@ -29,6 +29,7 @@ interface TestConditionalType {
`, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) class TestComponent extends BasePermsTestComponent { diff --git a/client/src/app/ui/directives/perms/oml-perms.directive.ts b/client/src/app/ui/directives/perms/oml-perms.directive.ts index c86a9112f2..1bb492b805 100644 --- a/client/src/app/ui/directives/perms/oml-perms.directive.ts +++ b/client/src/app/ui/directives/perms/oml-perms.directive.ts @@ -1,5 +1,5 @@ import { Directive, Input, TemplateRef } from '@angular/core'; -import { OML } from 'src/app/domain/definitions/organization-permission'; +import { OML } from '@app/domain/definitions/organization-permission'; import { BasePermsDirective } from './base-perms.directive'; diff --git a/client/src/app/ui/directives/perms/perms.directive.spec.ts b/client/src/app/ui/directives/perms/perms.directive.spec.ts index f283cb53b0..656ffc96b3 100644 --- a/client/src/app/ui/directives/perms/perms.directive.spec.ts +++ b/client/src/app/ui/directives/perms/perms.directive.spec.ts @@ -1,10 +1,10 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { DelegationSetting } from '@app/domain/definitions/delegation-setting'; +import { Permission } from '@app/domain/definitions/permission'; +import { OperatorService } from '@app/site/services/operator.service'; import { Observable, Subject } from 'rxjs'; -import { DelegationSetting } from 'src/app/domain/definitions/delegation-setting'; -import { Permission } from 'src/app/domain/definitions/permission'; -import { OperatorService } from 'src/app/site/services/operator.service'; import { PermsDirective } from './perms.directive'; @@ -38,6 +38,7 @@ export class BasePermsTestComponent { id="delegation" > `, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) class TestComponent extends BasePermsTestComponent { diff --git a/client/src/app/ui/directives/perms/perms.directive.ts b/client/src/app/ui/directives/perms/perms.directive.ts index 5b2243fbe0..2f29f3f830 100644 --- a/client/src/app/ui/directives/perms/perms.directive.ts +++ b/client/src/app/ui/directives/perms/perms.directive.ts @@ -1,7 +1,7 @@ import { Directive, Input, OnDestroy, OnInit } from '@angular/core'; +import { DelegationSetting } from '@app/domain/definitions/delegation-setting'; +import { Permission } from '@app/domain/definitions/permission'; import { Subscription } from 'rxjs'; -import { DelegationSetting } from 'src/app/domain/definitions/delegation-setting'; -import { Permission } from 'src/app/domain/definitions/permission'; import { BasePermsDirective } from './base-perms.directive'; diff --git a/client/src/app/ui/modules/chip/chip.component.spec.ts b/client/src/app/ui/modules/chip/chip.component.spec.ts index 684441b5c8..7560ae17c1 100644 --- a/client/src/app/ui/modules/chip/chip.component.spec.ts +++ b/client/src/app/ui/modules/chip/chip.component.spec.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatChipsModule } from '@angular/material/chips'; import { By } from '@angular/platform-browser'; @@ -9,6 +9,7 @@ import { ChipComponent } from './chip.component'; template: ` Or not to be `, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) class TestComponent {} diff --git a/client/src/app/ui/modules/chip/chip.component.ts b/client/src/app/ui/modules/chip/chip.component.ts index baa33a43eb..55bfc961ab 100644 --- a/client/src/app/ui/modules/chip/chip.component.ts +++ b/client/src/app/ui/modules/chip/chip.component.ts @@ -1,14 +1,15 @@ import { CommonModule } from '@angular/common'; -import { Component, ElementRef, inject, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ElementRef, inject, Input } from '@angular/core'; import { MatChipsModule } from '@angular/material/chips'; import { MatRippleModule } from '@angular/material/core'; -import { HtmlColor } from 'src/app/domain/definitions/key-types'; -import { Color, ColorService } from 'src/app/site/services/color.service'; +import { HtmlColor } from '@app/domain/definitions/key-types'; +import { Color, ColorService } from '@app/site/services/color.service'; @Component({ selector: `os-chip`, templateUrl: `./chip.component.html`, styleUrls: [`./chip.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, imports: [CommonModule, MatChipsModule, MatRippleModule] }) export class ChipComponent { diff --git a/client/src/app/ui/modules/choice-dialog/choice-dialog.component.ts b/client/src/app/ui/modules/choice-dialog/choice-dialog.component.ts index f2de7a3577..cfc5d87aa7 100644 --- a/client/src/app/ui/modules/choice-dialog/choice-dialog.component.ts +++ b/client/src/app/ui/modules/choice-dialog/choice-dialog.component.ts @@ -1,11 +1,11 @@ -import { Component, Inject, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, ViewEncapsulation } from '@angular/core'; import { FormsModule, ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { Id } from '@app/domain/definitions/key-types'; +import { Selectable } from '@app/domain/interfaces'; +import { OsOptionSelectionChanged, SearchSelectorModule } from '@app/ui/modules/search-selector'; import { TranslatePipe } from '@ngx-translate/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Selectable } from 'src/app/domain/interfaces'; -import { OsOptionSelectionChanged, SearchSelectorModule } from 'src/app/ui/modules/search-selector'; import { ChoiceAnswer, ChoiceDialogConfig } from './definitions'; @@ -14,6 +14,7 @@ import { ChoiceAnswer, ChoiceDialogConfig } from './definitions'; templateUrl: `./choice-dialog.component.html`, styleUrls: [`./choice-dialog.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, imports: [MatDialogModule, MatButtonModule, ReactiveFormsModule, FormsModule, SearchSelectorModule, TranslatePipe] }) export class ChoiceDialogComponent { diff --git a/client/src/app/ui/modules/choice-dialog/definitions/index.ts b/client/src/app/ui/modules/choice-dialog/definitions/index.ts index 2b5d076c6a..d272dbd021 100644 --- a/client/src/app/ui/modules/choice-dialog/definitions/index.ts +++ b/client/src/app/ui/modules/choice-dialog/definitions/index.ts @@ -1,6 +1,6 @@ +import { Id, Ids } from '@app/domain/definitions/key-types'; +import { Selectable } from '@app/domain/interfaces/selectable'; import { Observable } from 'rxjs'; -import { Id, Ids } from 'src/app/domain/definitions/key-types'; -import { Selectable } from 'src/app/domain/interfaces/selectable'; interface ChoiceDialogResult { /** diff --git a/client/src/app/ui/modules/choice-dialog/services/choice.service.ts b/client/src/app/ui/modules/choice-dialog/services/choice.service.ts index 8bbda6feec..658b745760 100644 --- a/client/src/app/ui/modules/choice-dialog/services/choice.service.ts +++ b/client/src/app/ui/modules/choice-dialog/services/choice.service.ts @@ -1,7 +1,7 @@ import { inject, Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; +import { Selectable } from '@app/domain/interfaces'; import { firstValueFrom, Observable } from 'rxjs'; -import { Selectable } from 'src/app/domain/interfaces'; import { infoDialogSettings } from '../../../../infrastructure/utils/dialog-settings'; import { ChoiceDialogComponent } from '../choice-dialog.component'; diff --git a/client/src/app/ui/modules/color-form-field/color-form-field.component.ts b/client/src/app/ui/modules/color-form-field/color-form-field.component.ts index 8eb972c031..cac6c69249 100644 --- a/client/src/app/ui/modules/color-form-field/color-form-field.component.ts +++ b/client/src/app/ui/modules/color-form-field/color-form-field.component.ts @@ -1,12 +1,12 @@ -import { Component, EventEmitter, forwardRef, Input, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, forwardRef, Input, Output } from '@angular/core'; import { FormsModule, NG_VALUE_ACCESSOR, ReactiveFormsModule, UntypedFormControl } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatTooltipModule } from '@angular/material/tooltip'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; import { BaseFormControlComponent } from '../../base/base-form-control'; @@ -15,6 +15,7 @@ import { BaseFormControlComponent } from '../../base/base-form-control'; templateUrl: `./color-form-field.component.html`, styleUrls: [`./color-form-field.component.scss`], providers: [{ provide: NG_VALUE_ACCESSOR, multi: true, useExisting: forwardRef(() => ColorFormFieldComponent) }], + changeDetection: ChangeDetectionStrategy.Eager, imports: [ ReactiveFormsModule, MatFormFieldModule, diff --git a/client/src/app/ui/modules/datepicker/components/base-datepicker/base-datepicker.component.ts b/client/src/app/ui/modules/datepicker/components/base-datepicker/base-datepicker.component.ts index 8931a4f817..2f0634e1f8 100644 --- a/client/src/app/ui/modules/datepicker/components/base-datepicker/base-datepicker.component.ts +++ b/client/src/app/ui/modules/datepicker/components/base-datepicker/base-datepicker.component.ts @@ -1,7 +1,7 @@ import { Directive, Input, ViewChild } from '@angular/core'; import { MatDatepicker, MatDateRangePicker } from '@angular/material/datepicker'; -import { KeyCode } from 'src/app/infrastructure/utils/key-code'; -import { BaseFormFieldControlComponent } from 'src/app/ui/base/base-form-field-control'; +import { KeyCode } from '@app/infrastructure/utils/key-code'; +import { BaseFormFieldControlComponent } from '@app/ui/base/base-form-field-control'; @Directive() export abstract class BaseDatepickerComponent extends BaseFormFieldControlComponent { diff --git a/client/src/app/ui/modules/datepicker/datepicker.module.ts b/client/src/app/ui/modules/datepicker/datepicker.module.ts index 856fb58af5..d7dbbfa29d 100644 --- a/client/src/app/ui/modules/datepicker/datepicker.module.ts +++ b/client/src/app/ui/modules/datepicker/datepicker.module.ts @@ -6,7 +6,7 @@ import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { DatepickerComponent } from './components/datepicker/datepicker.component'; import { DaterangepickerComponent } from './components/daterangepicker/daterangepicker.component'; diff --git a/client/src/app/ui/modules/editor/components/editor-embed-dialog/editor-embed-dialog.component.ts b/client/src/app/ui/modules/editor/components/editor-embed-dialog/editor-embed-dialog.component.ts index eccc42323a..1c693325e6 100644 --- a/client/src/app/ui/modules/editor/components/editor-embed-dialog/editor-embed-dialog.component.ts +++ b/client/src/app/ui/modules/editor/components/editor-embed-dialog/editor-embed-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; interface EditorEmbedData { @@ -19,6 +19,7 @@ export interface EditorEmbedDialogOutput { selector: `os-editor-image-dialog`, templateUrl: `./editor-embed-dialog.component.html`, styleUrls: [`editor-embed-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class EditorEmbedDialogComponent { diff --git a/client/src/app/ui/modules/editor/components/editor-html-dialog/editor-html-dialog.component.ts b/client/src/app/ui/modules/editor/components/editor-html-dialog/editor-html-dialog.component.ts index de9231977b..2b93ca29a9 100644 --- a/client/src/app/ui/modules/editor/components/editor-html-dialog/editor-html-dialog.component.ts +++ b/client/src/app/ui/modules/editor/components/editor-html-dialog/editor-html-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; export interface EditorHtmlDialogOutput { @@ -10,6 +10,7 @@ export interface EditorHtmlDialogOutput { selector: `os-editor-html-dialog`, templateUrl: `./editor-html-dialog.component.html`, styleUrls: [`./editor-html-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class EditorHtmlDialogComponent { diff --git a/client/src/app/ui/modules/editor/components/editor-image-dialog/editor-image-dialog.component.ts b/client/src/app/ui/modules/editor/components/editor-image-dialog/editor-image-dialog.component.ts index f58c16d7cb..f0d2a544c2 100644 --- a/client/src/app/ui/modules/editor/components/editor-image-dialog/editor-image-dialog.component.ts +++ b/client/src/app/ui/modules/editor/components/editor-image-dialog/editor-image-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject, inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; interface EditorImageData { @@ -20,6 +20,7 @@ export interface EditorImageDialogOutput { selector: `os-editor-image-dialog`, templateUrl: `./editor-image-dialog.component.html`, styleUrls: [`editor-image-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class EditorImageDialogComponent { diff --git a/client/src/app/ui/modules/editor/components/editor-link-dialog/editor-link-dialog.component.ts b/client/src/app/ui/modules/editor/components/editor-link-dialog/editor-link-dialog.component.ts index dd1dcde6f6..f21d281046 100644 --- a/client/src/app/ui/modules/editor/components/editor-link-dialog/editor-link-dialog.component.ts +++ b/client/src/app/ui/modules/editor/components/editor-link-dialog/editor-link-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; interface EditorLinkDialogInput { @@ -16,6 +16,7 @@ export interface EditorLinkDialogOutput { selector: `os-editor-link-dialog`, templateUrl: `./editor-link-dialog.component.html`, styleUrls: [`editor-link-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class EditorLinkDialogComponent { diff --git a/client/src/app/ui/modules/editor/components/editor/editor.component.ts b/client/src/app/ui/modules/editor/components/editor/editor.component.ts index 0a3187fa70..1035631369 100644 --- a/client/src/app/ui/modules/editor/components/editor/editor.component.ts +++ b/client/src/app/ui/modules/editor/components/editor/editor.component.ts @@ -1,5 +1,6 @@ import { AfterViewInit, + ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, @@ -15,6 +16,8 @@ import { } from '@angular/core'; import { NG_VALUE_ACCESSOR, UntypedFormControl } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; +import { unwrapNode } from '@app/infrastructure/utils/dom-helpers'; +import { BaseFormControlComponent } from '@app/ui/base/base-form-control'; import OfficePaste from '@intevation/tiptap-extension-office-paste'; import { TranslateService } from '@ngx-translate/core'; import { Editor, Extension } from '@tiptap/core'; @@ -36,8 +39,6 @@ import { Text } from '@tiptap/extension-text'; import { TextAlign } from '@tiptap/extension-text-align'; import { Underline } from '@tiptap/extension-underline'; import { UndoRedo } from '@tiptap/extensions'; -import { unwrapNode } from 'src/app/infrastructure/utils/dom-helpers'; -import { BaseFormControlComponent } from 'src/app/ui/base/base-form-control'; import tinycolor from 'tinycolor2'; import { ArrowNavigationDirective } from '../../directives/tab-navigation.directive'; @@ -91,6 +92,7 @@ const DEFAULT_COLOR_PALETE = [ templateUrl: `./editor.component.html`, styleUrls: [`./editor.component.scss`], providers: [{ provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => EditorComponent), multi: true }], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class EditorComponent extends BaseFormControlComponent implements AfterViewInit, OnDestroy { diff --git a/client/src/app/ui/modules/editor/editor.module.ts b/client/src/app/ui/modules/editor/editor.module.ts index ee73d107ca..46dd2b7a19 100644 --- a/client/src/app/ui/modules/editor/editor.module.ts +++ b/client/src/app/ui/modules/editor/editor.module.ts @@ -9,8 +9,8 @@ import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { MotionEditorComponent } from 'src/app/site/pages/meetings/pages/motions/components/motion-editor/motion-editor.component'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { MotionEditorComponent } from '@app/site/pages/meetings/pages/motions/components/motion-editor/motion-editor.component'; import { EditorComponent } from './components/editor/editor.component'; import { EditorEmbedDialogComponent } from './components/editor-embed-dialog/editor-embed-dialog.component'; diff --git a/client/src/app/ui/modules/expandable-content-wrapper/expandable-content-wrapper.component.ts b/client/src/app/ui/modules/expandable-content-wrapper/expandable-content-wrapper.component.ts index c4657bae7a..adf6d0627a 100644 --- a/client/src/app/ui/modules/expandable-content-wrapper/expandable-content-wrapper.component.ts +++ b/client/src/app/ui/modules/expandable-content-wrapper/expandable-content-wrapper.component.ts @@ -1,6 +1,6 @@ import { CommonModule } from '@angular/common'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input } from '@angular/core'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { DirectivesModule } from '../../directives'; diff --git a/client/src/app/ui/modules/file-list/file-list.component.ts b/client/src/app/ui/modules/file-list/file-list.component.ts index 6481d4d541..0dbc564fa4 100644 --- a/client/src/app/ui/modules/file-list/file-list.component.ts +++ b/client/src/app/ui/modules/file-list/file-list.component.ts @@ -20,20 +20,20 @@ import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; +import { Id } from '@app/domain/definitions/key-types'; +import { Mediafile } from '@app/domain/models/mediafiles/mediafile'; +import { getIntlCollatorForLang } from '@app/infrastructure/utils'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { ViewMediafile, ViewMeetingMediafile } from '@app/site/pages/meetings/pages/mediafiles'; +import { MediafileControllerService } from '@app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service'; +import { ViewGroup } from '@app/site/pages/meetings/pages/participants'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; +import { ListComponent } from '@app/ui/modules/list/components'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Mediafile } from 'src/app/domain/models/mediafiles/mediafile'; -import { getIntlCollatorForLang } from 'src/app/infrastructure/utils'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { ViewMediafile, ViewMeetingMediafile } from 'src/app/site/pages/meetings/pages/mediafiles'; -import { MediafileControllerService } from 'src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service'; -import { ViewGroup } from 'src/app/site/pages/meetings/pages/participants'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; -import { ListComponent } from 'src/app/ui/modules/list/components'; import { PipesModule } from '../../pipes'; import { CommaSeparatedListingComponent } from '../comma-separated-listing'; diff --git a/client/src/app/ui/modules/file-upload/components/file-upload/file-upload.component.ts b/client/src/app/ui/modules/file-upload/components/file-upload/file-upload.component.ts index 77943341e3..ddb9d91a01 100644 --- a/client/src/app/ui/modules/file-upload/components/file-upload/file-upload.component.ts +++ b/client/src/app/ui/modules/file-upload/components/file-upload/file-upload.component.ts @@ -1,4 +1,5 @@ import { + ChangeDetectionStrategy, Component, ContentChild, ElementRef, @@ -8,10 +9,10 @@ import { TemplateRef, ViewChild } from '@angular/core'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; import { FileSystemFileEntry, NgxFileDropEntry } from 'ngx-file-drop'; import { BehaviorSubject, Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; export interface FileData extends Identifiable { mediafile: File; @@ -27,6 +28,7 @@ let uniqueCounter = 0; selector: `os-file-upload`, templateUrl: `./file-upload.component.html`, styleUrls: [`./file-upload.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class FileUploadComponent { diff --git a/client/src/app/ui/modules/file-upload/file-upload.module.ts b/client/src/app/ui/modules/file-upload/file-upload.module.ts index 24cb4bd273..d1d57416bc 100644 --- a/client/src/app/ui/modules/file-upload/file-upload.module.ts +++ b/client/src/app/ui/modules/file-upload/file-upload.module.ts @@ -5,9 +5,9 @@ import { MatCardModule } from '@angular/material/card'; import { MatIconModule } from '@angular/material/icon'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatTooltipModule } from '@angular/material/tooltip'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { ScrollingTableModule } from '@app/ui/modules/scrolling-table'; import { NgxFileDropModule } from 'ngx-file-drop'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { ScrollingTableModule } from 'src/app/ui/modules/scrolling-table'; import { FileUploadComponent } from './components/file-upload/file-upload.component'; diff --git a/client/src/app/ui/modules/grid/grid/grid.component.ts b/client/src/app/ui/modules/grid/grid/grid.component.ts index eb90f950e5..96eeca5aeb 100644 --- a/client/src/app/ui/modules/grid/grid/grid.component.ts +++ b/client/src/app/ui/modules/grid/grid/grid.component.ts @@ -1,4 +1,4 @@ -import { Component, ContentChildren, Input, QueryList } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ContentChildren, Input, QueryList } from '@angular/core'; import { TileComponent } from '../tile/tile.component'; @@ -6,6 +6,7 @@ import { TileComponent } from '../tile/tile.component'; selector: `os-grid`, templateUrl: `./grid.component.html`, styleUrls: [`./grid.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class GridComponent { diff --git a/client/src/app/ui/modules/grid/tile/tile.component.ts b/client/src/app/ui/modules/grid/tile/tile.component.ts index a79f7e0adf..8883b1c426 100644 --- a/client/src/app/ui/modules/grid/tile/tile.component.ts +++ b/client/src/app/ui/modules/grid/tile/tile.component.ts @@ -1,4 +1,13 @@ -import { Component, EventEmitter, Input, OnInit, Output, TemplateRef, ViewChild } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + EventEmitter, + Input, + OnInit, + Output, + TemplateRef, + ViewChild +} from '@angular/core'; import { GridTileClickEvent, GridTileDimension } from '../definitions'; @@ -6,6 +15,7 @@ import { GridTileClickEvent, GridTileDimension } from '../definitions'; selector: `os-tile`, templateUrl: `./tile.component.html`, styleUrls: [`./tile.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class TileComponent implements OnInit { diff --git a/client/src/app/ui/modules/head-bar/components/head-bar/head-bar.component.ts b/client/src/app/ui/modules/head-bar/components/head-bar/head-bar.component.ts index f7ae2d95d2..59996f1082 100644 --- a/client/src/app/ui/modules/head-bar/components/head-bar/head-bar.component.ts +++ b/client/src/app/ui/modules/head-bar/components/head-bar/head-bar.component.ts @@ -1,6 +1,7 @@ import { TemplatePortal } from '@angular/cdk/portal'; import { AfterViewInit, + ChangeDetectionStrategy, Component, EventEmitter, inject, @@ -13,8 +14,8 @@ import { ViewEncapsulation } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; +import { GlobalHeadbarService } from '@app/site/modules/global-headbar/global-headbar.service'; import { BehaviorSubject, Observable } from 'rxjs'; -import { GlobalHeadbarService } from 'src/app/site/modules/global-headbar/global-headbar.service'; import { MainMenuService } from '../../../../../site/pages/meetings/services/main-menu.service'; import { ViewPortService } from '../../../../../site/services/view-port.service'; @@ -72,6 +73,7 @@ export const HEAD_BAR_HEIGHT = 50; // height of the head-bar in px. templateUrl: `./head-bar.component.html`, styleUrls: [`./head-bar.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class HeadBarComponent implements OnInit, AfterViewInit { diff --git a/client/src/app/ui/modules/head-bar/head-bar.module.ts b/client/src/app/ui/modules/head-bar/head-bar.module.ts index 2865b641f3..cc34d1bbc0 100644 --- a/client/src/app/ui/modules/head-bar/head-bar.module.ts +++ b/client/src/app/ui/modules/head-bar/head-bar.module.ts @@ -5,7 +5,7 @@ import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { SpinnerModule } from 'src/app/ui/modules/spinner'; +import { SpinnerModule } from '@app/ui/modules/spinner'; import { OpenSlidesTranslationModule } from '../../../site/modules/translations'; import { HeadBarComponent } from './components/head-bar/head-bar.component'; diff --git a/client/src/app/ui/modules/head-toolbar/head-toolbar.component.ts b/client/src/app/ui/modules/head-toolbar/head-toolbar.component.ts index dc22c53fe7..581833393a 100644 --- a/client/src/app/ui/modules/head-toolbar/head-toolbar.component.ts +++ b/client/src/app/ui/modules/head-toolbar/head-toolbar.component.ts @@ -1,6 +1,7 @@ import { TemplatePortal } from '@angular/cdk/portal'; import { AfterViewInit, + ChangeDetectionStrategy, Component, inject, OnDestroy, @@ -10,7 +11,7 @@ import { ViewEncapsulation } from '@angular/core'; import { MatToolbarModule } from '@angular/material/toolbar'; -import { GlobalHeadbarService } from 'src/app/site/modules/global-headbar/global-headbar.service'; +import { GlobalHeadbarService } from '@app/site/modules/global-headbar/global-headbar.service'; /** * Reusable toolbar compoment @@ -24,6 +25,7 @@ import { GlobalHeadbarService } from 'src/app/site/modules/global-headbar/global styleUrls: [`./head-toolbar.component.scss`], imports: [MatToolbarModule], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: true }) export class HeadToolbarComponent implements AfterViewInit, OnDestroy { diff --git a/client/src/app/ui/modules/icon-container/icon-container.component.ts b/client/src/app/ui/modules/icon-container/icon-container.component.ts index e1a2bd3698..9c0d69a87f 100644 --- a/client/src/app/ui/modules/icon-container/icon-container.component.ts +++ b/client/src/app/ui/modules/icon-container/icon-container.component.ts @@ -1,5 +1,5 @@ import { CommonModule } from '@angular/common'; -import { Component, EventEmitter, HostBinding, Input, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, HostBinding, Input, Output } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MatTooltipModule, TooltipPosition } from '@angular/material/tooltip'; @@ -7,6 +7,7 @@ import { MatTooltipModule, TooltipPosition } from '@angular/material/tooltip'; selector: `os-icon-container`, templateUrl: `./icon-container.component.html`, styleUrls: [`./icon-container.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, imports: [CommonModule, MatIconModule, MatTooltipModule] }) export class IconContainerComponent { diff --git a/client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts b/client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts index 2e44e90c9f..dd2c35257c 100644 --- a/client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts +++ b/client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts @@ -1,4 +1,5 @@ import { + ChangeDetectionStrategy, Component, ContentChild, ContentChildren, @@ -17,12 +18,12 @@ import { import { MatDialog } from '@angular/material/dialog'; import { MatSelectChange } from '@angular/material/select'; import { MatTabChangeEvent } from '@angular/material/tabs'; +import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { ValueLabelCombination } from '@app/infrastructure/utils/import/import-utils'; +import { BackendImportService } from '@app/ui/base/import-service'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; import { delay, firstValueFrom, map, Observable, of } from 'rxjs'; -import { infoDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { ValueLabelCombination } from 'src/app/infrastructure/utils/import/import-utils'; -import { BackendImportService } from 'src/app/ui/base/import-service'; import { ScrollingTableCellDefConfig } from '../../../scrolling-table/directives/scrolling-table-cell-config'; import { END_POSITION, START_POSITION } from '../../../scrolling-table/directives/scrolling-table-cell-position'; @@ -53,6 +54,7 @@ export enum BackendImportPhase { templateUrl: `./backend-import-list.component.html`, styleUrls: [`./backend-import-list.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class BackendImportListComponent implements OnInit, OnDestroy { diff --git a/client/src/app/ui/modules/import-list/definitions/backend-import-preview.ts b/client/src/app/ui/modules/import-list/definitions/backend-import-preview.ts index 5615278084..859fbe94c4 100644 --- a/client/src/app/ui/modules/import-list/definitions/backend-import-preview.ts +++ b/client/src/app/ui/modules/import-list/definitions/backend-import-preview.ts @@ -1,4 +1,4 @@ -import { Identifiable } from 'src/app/domain/interfaces'; +import { Identifiable } from '@app/domain/interfaces'; export enum BackendImportState { Error = `error`, diff --git a/client/src/app/ui/modules/import-list/import-list.module.ts b/client/src/app/ui/modules/import-list/import-list.module.ts index bc760e1bef..ea259fd2b5 100644 --- a/client/src/app/ui/modules/import-list/import-list.module.ts +++ b/client/src/app/ui/modules/import-list/import-list.module.ts @@ -10,9 +10,9 @@ import { MatIconModule } from '@angular/material/icon'; import { MatSelectModule } from '@angular/material/select'; import { MatTabsModule } from '@angular/material/tabs'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { EditorModule } from 'src/app/ui/modules/editor/editor.module'; -import { ScrollingTableModule } from 'src/app/ui/modules/scrolling-table'; -import { PipesModule } from 'src/app/ui/pipes/pipes.module'; +import { EditorModule } from '@app/ui/modules/editor/editor.module'; +import { ScrollingTableModule } from '@app/ui/modules/scrolling-table'; +import { PipesModule } from '@app/ui/pipes/pipes.module'; import { OpenSlidesTranslationModule } from '../../../site/modules/translations'; import { BackendImportListComponent } from './components/via-backend-import-list/backend-import-list.component'; diff --git a/client/src/app/ui/modules/input/components/rounded-input/rounded-input.component.ts b/client/src/app/ui/modules/input/components/rounded-input/rounded-input.component.ts index ae7de4b1be..b4054a2514 100644 --- a/client/src/app/ui/modules/input/components/rounded-input/rounded-input.component.ts +++ b/client/src/app/ui/modules/input/components/rounded-input/rounded-input.component.ts @@ -1,8 +1,18 @@ -import { Component, ElementRef, EventEmitter, HostBinding, Input, OnInit, Output, ViewChild } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + ElementRef, + EventEmitter, + HostBinding, + Input, + OnInit, + Output, + ViewChild +} from '@angular/core'; import { forwardRef } from '@angular/core'; import { NG_VALUE_ACCESSOR, UntypedFormControl } from '@angular/forms'; +import { BaseFormControlComponent } from '@app/ui/base/base-form-control'; import { debounceTime } from 'rxjs'; -import { BaseFormControlComponent } from 'src/app/ui/base/base-form-control'; /** * Type declared to see, which values are possible for some inputs. @@ -14,6 +24,7 @@ export type Size = `small` | `medium` | `large`; templateUrl: `./rounded-input.component.html`, styleUrls: [`./rounded-input.component.scss`], providers: [{ provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => RoundedInputComponent), multi: true }], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class RoundedInputComponent extends BaseFormControlComponent implements OnInit { diff --git a/client/src/app/ui/modules/list/base/base-list.component.ts b/client/src/app/ui/modules/list/base/base-list.component.ts index ebe79cc5dc..777f75cdba 100644 --- a/client/src/app/ui/modules/list/base/base-list.component.ts +++ b/client/src/app/ui/modules/list/base/base-list.component.ts @@ -9,10 +9,10 @@ import { Output, ViewChild } from '@angular/core'; +import { Identifiable } from '@app/domain/interfaces'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { ViewModelListProvider } from '@app/ui/base/view-model-list-provider'; import { Observable } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { ViewModelListProvider } from 'src/app/ui/base/view-model-list-provider'; import { ScrollingTableManageService } from '../../scrolling-table'; import { ViewListComponent } from '../components/view-list/view-list.component'; diff --git a/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.spec.ts b/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.spec.ts index ce4b6516bc..2d35ab1e9d 100644 --- a/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.spec.ts +++ b/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { BaseViewModel } from 'src/app/site/base/base-view-model'; +import { BaseViewModel } from '@app/site/base/base-view-model'; import { FilterMenuComponent } from './filter-menu.component'; diff --git a/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.ts b/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.ts index 1f8304cfca..e1383a1e30 100644 --- a/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.ts +++ b/client/src/app/ui/modules/list/components/filter-menu/filter-menu.component.ts @@ -10,8 +10,8 @@ import { } from '@angular/core'; import { ChangeDetectorRef } from '@angular/core'; import { MatCheckbox } from '@angular/material/checkbox'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { OsFilterOption, OsFilterOptions } from 'src/app/site/base/base-filter.service'; +import { Identifiable } from '@app/domain/interfaces'; +import { OsFilterOption, OsFilterOptions } from '@app/site/base/base-filter.service'; import { FilterListService } from '../../definitions/filter-service'; diff --git a/client/src/app/ui/modules/list/components/list/list.component.spec.ts b/client/src/app/ui/modules/list/components/list/list.component.spec.ts index 23089dfd7a..c72bff6a49 100644 --- a/client/src/app/ui/modules/list/components/list/list.component.spec.ts +++ b/client/src/app/ui/modules/list/components/list/list.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { Identifiable } from 'src/app/domain/interfaces'; +import { Identifiable } from '@app/domain/interfaces'; import { ListComponent } from './list.component'; diff --git a/client/src/app/ui/modules/list/components/list/list.component.ts b/client/src/app/ui/modules/list/components/list/list.component.ts index d1d2acbcce..387bd573ab 100644 --- a/client/src/app/ui/modules/list/components/list/list.component.ts +++ b/client/src/app/ui/modules/list/components/list/list.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { Identifiable } from '@app/domain/interfaces'; import { Observable } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; import { BaseListComponent } from '../../base/base-list.component'; diff --git a/client/src/app/ui/modules/list/components/sort-bottom-sheet/sort-bottom-sheet.component.ts b/client/src/app/ui/modules/list/components/sort-bottom-sheet/sort-bottom-sheet.component.ts index 1e3de90adf..a31b415299 100644 --- a/client/src/app/ui/modules/list/components/sort-bottom-sheet/sort-bottom-sheet.component.ts +++ b/client/src/app/ui/modules/list/components/sort-bottom-sheet/sort-bottom-sheet.component.ts @@ -1,7 +1,7 @@ -import { Component, Inject, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core'; import { MAT_BOTTOM_SHEET_DATA, MatBottomSheetRef } from '@angular/material/bottom-sheet'; -import { OsSortProperty } from 'src/app/site/base/base-sort.service'; -import { SortListService } from 'src/app/ui/modules/list/definitions/sort-service'; +import { OsSortProperty } from '@app/site/base/base-sort.service'; +import { SortListService } from '@app/ui/modules/list/definitions/sort-service'; /** * A bottom sheet used for setting a list's sorting, used by {@link SortFilterBarComponent} @@ -17,6 +17,7 @@ import { SortListService } from 'src/app/ui/modules/list/definitions/sort-servic selector: `os-sort-bottom-sheet`, templateUrl: `./sort-bottom-sheet.component.html`, styleUrls: [`./sort-bottom-sheet.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class SortBottomSheetComponent implements OnInit { diff --git a/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.spec.ts b/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.spec.ts index 69badbaeef..3f2a6c541c 100644 --- a/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.spec.ts +++ b/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; import { SortFilterBarComponent } from './sort-filter-bar.component'; diff --git a/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.ts b/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.ts index 00df1371ba..5f0fc56951 100644 --- a/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.ts +++ b/client/src/app/ui/modules/list/components/sort-filter-bar/sort-filter-bar.component.ts @@ -13,14 +13,14 @@ import { } from '@angular/core'; import { MatBottomSheet } from '@angular/material/bottom-sheet'; import { MatDrawer } from '@angular/material/sidenav'; +import { Identifiable } from '@app/domain/interfaces'; +import { OsFilterIndicator } from '@app/site/base/base-filter.service'; +import { OsSortingOption } from '@app/site/base/base-sort.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; +import { FilterListService } from '@app/ui/modules/list/definitions/filter-service'; +import { OsSortOption, SortListService } from '@app/ui/modules/list/definitions/sort-service'; import { TranslateService } from '@ngx-translate/core'; import { Observable, Subscription } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { OsFilterIndicator } from 'src/app/site/base/base-filter.service'; -import { OsSortingOption } from 'src/app/site/base/base-sort.service'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; -import { FilterListService } from 'src/app/ui/modules/list/definitions/filter-service'; -import { OsSortOption, SortListService } from 'src/app/ui/modules/list/definitions/sort-service'; import { RoundedInputComponent } from '../../../input/components/rounded-input/rounded-input.component'; import { SearchService } from '../../definitions/search-service'; diff --git a/client/src/app/ui/modules/list/components/view-list/view-list.component.spec.ts b/client/src/app/ui/modules/list/components/view-list/view-list.component.spec.ts index a344b217ae..68880cd0bf 100644 --- a/client/src/app/ui/modules/list/components/view-list/view-list.component.spec.ts +++ b/client/src/app/ui/modules/list/components/view-list/view-list.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; import { ViewListComponent } from './view-list.component'; diff --git a/client/src/app/ui/modules/list/components/view-list/view-list.component.ts b/client/src/app/ui/modules/list/components/view-list/view-list.component.ts index 9c4444dac9..64d7bba845 100644 --- a/client/src/app/ui/modules/list/components/view-list/view-list.component.ts +++ b/client/src/app/ui/modules/list/components/view-list/view-list.component.ts @@ -10,9 +10,9 @@ import { ViewChild, ViewEncapsulation } from '@angular/core'; +import { Identifiable } from '@app/domain/interfaces'; +import { ViewModelListProvider } from '@app/ui/base/view-model-list-provider'; import { BehaviorSubject, delay, find, map, Observable, of } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { ViewModelListProvider } from 'src/app/ui/base/view-model-list-provider'; import { ScrollingTableComponent } from '../../../scrolling-table/components/scrolling-table/scrolling-table.component'; import { FilterListService, SearchService, SortListService } from '../../definitions'; diff --git a/client/src/app/ui/modules/list/definitions/filter-service.ts b/client/src/app/ui/modules/list/definitions/filter-service.ts index 871954f639..98db759e6a 100644 --- a/client/src/app/ui/modules/list/definitions/filter-service.ts +++ b/client/src/app/ui/modules/list/definitions/filter-service.ts @@ -1,7 +1,7 @@ +import { Identifiable } from '@app/domain/interfaces'; +import { OsFilter, OsFilterIndicator, OsFilterOption } from '@app/site/base/base-filter.service'; +import { ViewModelListProvider } from '@app/ui/base/view-model-list-provider'; import { Observable } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { OsFilter, OsFilterIndicator, OsFilterOption } from 'src/app/site/base/base-filter.service'; -import { ViewModelListProvider } from 'src/app/ui/base/view-model-list-provider'; export interface FilterListService extends ViewModelListProvider { readonly unfilteredCount: number; readonly filterCount: number; diff --git a/client/src/app/ui/modules/list/definitions/sort-service.ts b/client/src/app/ui/modules/list/definitions/sort-service.ts index 964971c77e..8485f98aec 100644 --- a/client/src/app/ui/modules/list/definitions/sort-service.ts +++ b/client/src/app/ui/modules/list/definitions/sort-service.ts @@ -1,6 +1,6 @@ +import { Deferred } from '@app/infrastructure/utils/promises'; +import { OsSortingDefinition, OsSortProperty } from '@app/site/base/base-sort.service'; import { Observable } from 'rxjs'; -import { Deferred } from 'src/app/infrastructure/utils/promises'; -import { OsSortingDefinition, OsSortProperty } from 'src/app/site/base/base-sort.service'; export type SortDefinition = keyof T | OsSortDefinition; /** diff --git a/client/src/app/ui/modules/list/list.module.ts b/client/src/app/ui/modules/list/list.module.ts index 8371c3027f..affd9bf492 100644 --- a/client/src/app/ui/modules/list/list.module.ts +++ b/client/src/app/ui/modules/list/list.module.ts @@ -14,10 +14,10 @@ import { MatListModule } from '@angular/material/list'; import { MatMenuModule } from '@angular/material/menu'; import { MatSidenavModule } from '@angular/material/sidenav'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { IconContainerComponent } from 'src/app/ui/modules/icon-container'; -import { InputModule } from 'src/app/ui/modules/input'; -import { ScrollingTableModule } from 'src/app/ui/modules/scrolling-table'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { IconContainerComponent } from '@app/ui/modules/icon-container'; +import { InputModule } from '@app/ui/modules/input'; +import { ScrollingTableModule } from '@app/ui/modules/scrolling-table'; import { FilterMenuComponent } from './components/filter-menu/filter-menu.component'; import { ListComponent } from './components/list/list.component'; diff --git a/client/src/app/ui/modules/list/services/list-search.service.ts b/client/src/app/ui/modules/list/services/list-search.service.ts index df6ed82107..a1896e576e 100644 --- a/client/src/app/ui/modules/list/services/list-search.service.ts +++ b/client/src/app/ui/modules/list/services/list-search.service.ts @@ -1,5 +1,5 @@ +import { Identifiable } from '@app/domain/interfaces'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; import { SearchService } from '../definitions/search-service'; diff --git a/client/src/app/ui/modules/media-upload-content/media-upload-content.component.ts b/client/src/app/ui/modules/media-upload-content/media-upload-content.component.ts index 2acfe9a862..e445ca5e15 100644 --- a/client/src/app/ui/modules/media-upload-content/media-upload-content.component.ts +++ b/client/src/app/ui/modules/media-upload-content/media-upload-content.component.ts @@ -1,15 +1,15 @@ -import { Component, EventEmitter, inject, Input, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, inject, Input, OnInit, Output } from '@angular/core'; import { FormsModule, ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; +import { Id } from '@app/domain/definitions/key-types'; +import { Identifiable } from '@app/domain/interfaces'; +import { toBase64 } from '@app/infrastructure/utils'; +import { ViewMediafile } from '@app/site/pages/meetings/pages/mediafiles'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { TranslatePipe } from '@ngx-translate/core'; import { Observable } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { toBase64 } from 'src/app/infrastructure/utils'; -import { ViewMediafile } from 'src/app/site/pages/meetings/pages/mediafiles'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { PipesModule } from '../../pipes'; import { FileUploadModule } from '../file-upload'; @@ -27,6 +27,7 @@ export interface UploadSuccessEvent { selector: `os-media-upload-content`, templateUrl: `./media-upload-content.component.html`, styleUrls: [`./media-upload-content.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, imports: [ FormsModule, ReactiveFormsModule, diff --git a/client/src/app/ui/modules/meeting-time/meeting-time.component.ts b/client/src/app/ui/modules/meeting-time/meeting-time.component.ts index 48413eeed0..2f173686c7 100644 --- a/client/src/app/ui/modules/meeting-time/meeting-time.component.ts +++ b/client/src/app/ui/modules/meeting-time/meeting-time.component.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; -import { Component, inject, Input } from '@angular/core'; -import { ViewMeeting } from 'src/app/site/pages/meetings/view-models/view-meeting'; -import { TimeZoneService } from 'src/app/site/services/time-zone.service'; +import { ChangeDetectionStrategy, Component, inject, Input } from '@angular/core'; +import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; +import { TimeZoneService } from '@app/site/services/time-zone.service'; import { PipesModule } from '../../pipes'; @@ -9,6 +9,7 @@ import { PipesModule } from '../../pipes'; selector: `os-meeting-time`, templateUrl: `./meeting-time.component.html`, styleUrls: [`./meeting-time.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, imports: [CommonModule, PipesModule] }) export class MeetingTimeComponent { diff --git a/client/src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.ts b/client/src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.ts index 19339f489e..54e864e964 100644 --- a/client/src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.ts +++ b/client/src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.ts @@ -1,8 +1,7 @@ -import { Inject, inject, Injectable, Optional } from '@angular/core'; -import { MAT_DATE_LOCALE } from '@angular/material/core'; +import { inject, Injectable } from '@angular/core'; import { DateFnsAdapter } from '@angular/material-date-fns-adapter'; +import { langToTimeLocale } from '@app/infrastructure/utils'; import { TranslateService } from '@ngx-translate/core'; -import { langToTimeLocale } from 'src/app/infrastructure/utils'; /** * A custom DateAdapter for the datetimepicker in the config. Uses MomentDateAdapter for localisation. @@ -12,8 +11,8 @@ import { langToTimeLocale } from 'src/app/infrastructure/utils'; export class OpenSlidesDateAdapter extends DateFnsAdapter { private translate = inject(TranslateService); - public constructor(@Optional() @Inject(MAT_DATE_LOCALE) dateLocale: string) { - super(dateLocale); + public constructor() { + super(); // subscribe to language changes to change localisation of dates accordingly // DateAdapter seems not to be a singleton so we do that in this subclass instead of app.component this.updateLocaleByName(this.translate.getCurrentLang()); diff --git a/client/src/app/ui/modules/openslides-overlay/overlay.component.ts b/client/src/app/ui/modules/openslides-overlay/overlay.component.ts index ad7b3eba1a..32a15eca62 100644 --- a/client/src/app/ui/modules/openslides-overlay/overlay.component.ts +++ b/client/src/app/ui/modules/openslides-overlay/overlay.component.ts @@ -1,4 +1,5 @@ import { + ChangeDetectionStrategy, Component, EmbeddedViewRef, EventEmitter, @@ -16,6 +17,7 @@ import { OverlayPosition } from './definitions'; @Component({ selector: `os-overlay`, templateUrl: `./overlay.component.html`, + changeDetection: ChangeDetectionStrategy.Eager, styleUrls: [`./overlay.component.scss`] }) export class OverlayComponent { diff --git a/client/src/app/ui/modules/openslides-overlay/services/overlay.service.ts b/client/src/app/ui/modules/openslides-overlay/services/overlay.service.ts index d69a6d66ca..2c3e1f7ae1 100644 --- a/client/src/app/ui/modules/openslides-overlay/services/overlay.service.ts +++ b/client/src/app/ui/modules/openslides-overlay/services/overlay.service.ts @@ -1,5 +1,5 @@ import { inject, Injectable, Type } from '@angular/core'; -import { DomService } from 'src/app/openslides-main-module/services/dom.service'; +import { DomService } from '@app/openslides-main-module/services/dom.service'; import { CustomOverlayConfig, OverlayInstance } from '../definitions'; import { OverlayComponent } from '../overlay.component'; diff --git a/client/src/app/ui/modules/prompt-checkbox/prompt-checkbox.component.ts b/client/src/app/ui/modules/prompt-checkbox/prompt-checkbox.component.ts index 4949dc89e0..7f3c1d07e4 100644 --- a/client/src/app/ui/modules/prompt-checkbox/prompt-checkbox.component.ts +++ b/client/src/app/ui/modules/prompt-checkbox/prompt-checkbox.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, inject, Input, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, inject, Input, Output } from '@angular/core'; import { MAT_CHECKBOX_DEFAULT_OPTIONS, MatCheckboxDefaultOptions, MatCheckboxModule } from '@angular/material/checkbox'; import { PromptService } from '../prompt-dialog'; @@ -10,6 +10,7 @@ import { PromptService } from '../prompt-dialog'; providers: [ { provide: MAT_CHECKBOX_DEFAULT_OPTIONS, useValue: { clickAction: `noop` } as MatCheckboxDefaultOptions } ], + changeDetection: ChangeDetectionStrategy.Eager, imports: [MatCheckboxModule] }) export class PromptCheckboxComponent { diff --git a/client/src/app/ui/modules/prompt-dialog/prompt-dialog.component.ts b/client/src/app/ui/modules/prompt-dialog/prompt-dialog.component.ts index 570c9e66cf..3be9ddd38a 100644 --- a/client/src/app/ui/modules/prompt-dialog/prompt-dialog.component.ts +++ b/client/src/app/ui/modules/prompt-dialog/prompt-dialog.component.ts @@ -1,5 +1,5 @@ import { CommonModule } from '@angular/common'; -import { Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { TranslatePipe } from '@ngx-translate/core'; @@ -17,6 +17,7 @@ interface PromptDialogData { selector: `os-prompt-dialog`, templateUrl: `./prompt-dialog.component.html`, styleUrls: [`./prompt-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, imports: [CommonModule, MatDialogModule, MatButtonModule, TranslatePipe] }) export class PromptDialogComponent { diff --git a/client/src/app/ui/modules/qr-code/qr-code.component.ts b/client/src/app/ui/modules/qr-code/qr-code.component.ts index 3c83f90f70..2d5797397f 100644 --- a/client/src/app/ui/modules/qr-code/qr-code.component.ts +++ b/client/src/app/ui/modules/qr-code/qr-code.component.ts @@ -1,10 +1,11 @@ -import { AfterViewInit, Component, ElementRef, Input, ViewChild } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Input, ViewChild } from '@angular/core'; import QRCode from 'qrcode'; import { BehaviorSubject, distinctUntilChanged } from 'rxjs'; @Component({ selector: `os-qr-code`, templateUrl: `./qr-code.component.html`, + changeDetection: ChangeDetectionStrategy.Eager, styleUrls: [`./qr-code.component.scss`] }) export class QrCodeComponent implements AfterViewInit { diff --git a/client/src/app/ui/modules/scrolling-table/components/scrolling-table/scrolling-table.component.ts b/client/src/app/ui/modules/scrolling-table/components/scrolling-table/scrolling-table.component.ts index 59f2dafa0c..058d9a21eb 100644 --- a/client/src/app/ui/modules/scrolling-table/components/scrolling-table/scrolling-table.component.ts +++ b/client/src/app/ui/modules/scrolling-table/components/scrolling-table/scrolling-table.component.ts @@ -1,12 +1,22 @@ import { TemplatePortal } from '@angular/cdk/portal'; import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; -import { AfterViewInit, Component, ElementRef, inject, Input, OnInit, Output, ViewChild } from '@angular/core'; +import { + AfterViewInit, + ChangeDetectionStrategy, + Component, + ElementRef, + inject, + Input, + OnInit, + Output, + ViewChild +} from '@angular/core'; import { ChangeDetectorRef, EventEmitter, HostListener, OnDestroy } from '@angular/core'; +import { Identifiable } from '@app/domain/interfaces'; +import { Mapable, Mutable } from '@app/infrastructure/utils'; +import { KeyCode } from '@app/infrastructure/utils/key-code'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; import { BehaviorSubject, map, Observable } from 'rxjs'; -import { Identifiable } from 'src/app/domain/interfaces'; -import { Mapable, Mutable } from 'src/app/infrastructure/utils'; -import { KeyCode } from 'src/app/infrastructure/utils/key-code'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; import { SCROLLING_TABLE } from '../../definitions/index'; import { ScrollingTableCellDefinition } from '../../directives/scrolling-table-cell-definition'; @@ -33,6 +43,7 @@ interface DataSourceProvider { templateUrl: `./scrolling-table.component.html`, styleUrls: [`./scrolling-table.component.scss`], providers: [{ provide: SCROLLING_TABLE, useExisting: ScrollingTableComponent }], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ScrollingTableComponent>> diff --git a/client/src/app/ui/modules/scrolling-table/directives/scrolling-table-cell-label.directive.ts b/client/src/app/ui/modules/scrolling-table/directives/scrolling-table-cell-label.directive.ts index 054ea8fb88..3568ddd6f2 100644 --- a/client/src/app/ui/modules/scrolling-table/directives/scrolling-table-cell-label.directive.ts +++ b/client/src/app/ui/modules/scrolling-table/directives/scrolling-table-cell-label.directive.ts @@ -1,5 +1,5 @@ import { CdkPortal } from '@angular/cdk/portal'; -import { Directive, TemplateRef, ViewContainerRef } from '@angular/core'; +import { Directive } from '@angular/core'; import { ScrollingTableCellDirective } from './scrolling-table-cell.directive'; @@ -8,12 +8,8 @@ import { ScrollingTableCellDirective } from './scrolling-table-cell.directive'; standalone: false }) export class ScrollingTableCellLabelDirective extends CdkPortal { - public constructor( - template: TemplateRef, - viewContainer: ViewContainerRef, - host: ScrollingTableCellDirective - ) { - super(template, viewContainer); + public constructor(host: ScrollingTableCellDirective) { + super(); host.labelTemplate = this; // Propagate the template to the host } } diff --git a/client/src/app/ui/modules/scrolling-table/directives/scrolling-table-no-data.directive.ts b/client/src/app/ui/modules/scrolling-table/directives/scrolling-table-no-data.directive.ts index e5c5b3125b..b288ffb72c 100644 --- a/client/src/app/ui/modules/scrolling-table/directives/scrolling-table-no-data.directive.ts +++ b/client/src/app/ui/modules/scrolling-table/directives/scrolling-table-no-data.directive.ts @@ -1,5 +1,5 @@ import { CdkPortal } from '@angular/cdk/portal'; -import { Directive, inject, OnInit, TemplateRef, ViewContainerRef } from '@angular/core'; +import { Directive, inject, OnInit } from '@angular/core'; import { ScrollingTableManageService } from '../services'; @@ -10,10 +10,6 @@ import { ScrollingTableManageService } from '../services'; export class ScrollingTableNoDataDirective extends CdkPortal implements OnInit { private manageService = inject(ScrollingTableManageService); - public constructor(template: TemplateRef, viewContainer: ViewContainerRef) { - super(template, viewContainer); - } - public ngOnInit(): void { this.manageService.noDataTemplateSubject.next(this); } diff --git a/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts b/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts index 101778be75..73eb3b07b2 100644 --- a/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts +++ b/client/src/app/ui/modules/search-selector/components/base-search-selector/base-search-selector.component.ts @@ -16,10 +16,10 @@ import { OnInit } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; import { MatOption, MatOptionSelectionChange } from '@angular/material/core'; import { MatSelect } from '@angular/material/select'; +import { Id } from '@app/domain/definitions/key-types'; +import { Selectable } from '@app/domain/interfaces/selectable'; import { _ } from '@ngx-translate/core'; import { BehaviorSubject, debounceTime, distinctUntilChanged, Observable, Subscription } from 'rxjs'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Selectable } from 'src/app/domain/interfaces/selectable'; import { BaseFormFieldControlComponent } from '../../../../base/base-form-field-control'; import { OsOptionSelectionChanged } from '../../definitions'; diff --git a/client/src/app/ui/modules/search-selector/components/list-search-selector/list-search-selector.component.ts b/client/src/app/ui/modules/search-selector/components/list-search-selector/list-search-selector.component.ts index 05a007f002..b2bc89f07c 100644 --- a/client/src/app/ui/modules/search-selector/components/list-search-selector/list-search-selector.component.ts +++ b/client/src/app/ui/modules/search-selector/components/list-search-selector/list-search-selector.component.ts @@ -34,6 +34,7 @@ export class ListSearchSelectorComponent extends BaseSearchSelectorComponent { } if (Array.isArray(value)) { this.selectableItems = value; + this.isListEmpty.set(!value || (!!value && !value.length)); } else { this._inputListValuesSubscription = value.pipe(auditTime(10), distinctUntilChanged()).subscribe(items => { this.selectableItems = items; diff --git a/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts b/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts index d7794bb788..b03dc00aa4 100644 --- a/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts +++ b/client/src/app/ui/modules/search-selector/components/repo-search-selector/repo-search-selector.component.ts @@ -1,8 +1,18 @@ -import { Component, inject, Input, OnDestroy, OnInit, Optional, Self, ViewEncapsulation } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + inject, + Input, + OnDestroy, + OnInit, + Optional, + Self, + ViewEncapsulation +} from '@angular/core'; import { NgControl } from '@angular/forms'; import { MatFormFieldControl } from '@angular/material/form-field'; +import { ModelRequestService, SubscribeToConfig } from '@app/site/services/model-request.service'; import { map, OperatorFunction } from 'rxjs'; -import { ModelRequestService, SubscribeToConfig } from 'src/app/site/services/model-request.service'; import { Settings } from '../../../../../domain/models/meetings/meeting'; import { MeetingSettingsService } from '../../../../../site/pages/meetings/services/meeting-settings.service'; @@ -16,6 +26,7 @@ import { BaseSearchSelectorComponent } from '../base-search-selector/base-search styleUrls: [`../base-search-selector/base-search-selector.component.scss`, `./repo-search-selector.component.scss`], providers: [{ provide: MatFormFieldControl, useExisting: RepoSearchSelectorComponent }], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class RepoSearchSelectorComponent extends BaseSearchSelectorComponent implements OnInit, OnDestroy { diff --git a/client/src/app/ui/modules/search-selector/definitions.ts b/client/src/app/ui/modules/search-selector/definitions.ts index 407b506056..54df6581fc 100644 --- a/client/src/app/ui/modules/search-selector/definitions.ts +++ b/client/src/app/ui/modules/search-selector/definitions.ts @@ -1,4 +1,4 @@ -import { Selectable } from 'src/app/domain/interfaces/selectable'; +import { Selectable } from '@app/domain/interfaces/selectable'; export interface OsOptionSelectionChanged { value: T; diff --git a/client/src/app/ui/modules/search-selector/search-selector.module.ts b/client/src/app/ui/modules/search-selector/search-selector.module.ts index ee2b5e4793..beaa3331eb 100644 --- a/client/src/app/ui/modules/search-selector/search-selector.module.ts +++ b/client/src/app/ui/modules/search-selector/search-selector.module.ts @@ -7,7 +7,7 @@ import { MatChipsModule } from '@angular/material/chips'; import { MatIconModule } from '@angular/material/icon'; import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { DirectivesModule } from 'src/app/ui/directives'; +import { DirectivesModule } from '@app/ui/directives'; import { OpenSlidesTranslationModule } from '../../../site/modules/translations'; import { ListSearchSelectorComponent } from './components/list-search-selector/list-search-selector.component'; diff --git a/client/src/app/ui/modules/sidenav/components/copyright-sign/copyright-sign.component.ts b/client/src/app/ui/modules/sidenav/components/copyright-sign/copyright-sign.component.ts index 89f32849b7..8bc1a77dc5 100644 --- a/client/src/app/ui/modules/sidenav/components/copyright-sign/copyright-sign.component.ts +++ b/client/src/app/ui/modules/sidenav/components/copyright-sign/copyright-sign.component.ts @@ -1,4 +1,4 @@ -import { Component, inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { EasterEggContentPlatformService } from '../../modules/easter-egg/services/easter-egg-content-platform.service'; @@ -6,6 +6,7 @@ import { EasterEggContentPlatformService } from '../../modules/easter-egg/servic selector: `os-copyright-sign`, templateUrl: `./copyright-sign.component.html`, styleUrls: [`./copyright-sign.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class CopyrightSignComponent { diff --git a/client/src/app/ui/modules/sidenav/components/image/image.component.ts b/client/src/app/ui/modules/sidenav/components/image/image.component.ts index a5d5ae91b0..0e5f072bda 100644 --- a/client/src/app/ui/modules/sidenav/components/image/image.component.ts +++ b/client/src/app/ui/modules/sidenav/components/image/image.component.ts @@ -1,10 +1,11 @@ -import { Component, inject, Input } from '@angular/core'; -import { HttpService } from 'src/app/gateways/http.service'; +import { ChangeDetectionStrategy, Component, inject, Input } from '@angular/core'; +import { HttpService } from '@app/gateways/http.service'; @Component({ selector: `os-image`, templateUrl: `./image.component.html`, styleUrls: [`./image.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ImageComponent { diff --git a/client/src/app/ui/modules/sidenav/components/logo/logo.component.ts b/client/src/app/ui/modules/sidenav/components/logo/logo.component.ts index d814c5af87..f7dfbe890f 100644 --- a/client/src/app/ui/modules/sidenav/components/logo/logo.component.ts +++ b/client/src/app/ui/modules/sidenav/components/logo/logo.component.ts @@ -1,7 +1,7 @@ -import { Component, inject, Input, OnInit } from '@angular/core'; -import { MediaManageService } from 'src/app/site/pages/meetings/services/media-manage.service'; -import { ThemeService } from 'src/app/site/services/theme.service'; -import { BaseUiComponent } from 'src/app/ui/base/base-ui-component'; +import { ChangeDetectionStrategy, Component, inject, Input, OnInit } from '@angular/core'; +import { MediaManageService } from '@app/site/pages/meetings/services/media-manage.service'; +import { ThemeService } from '@app/site/services/theme.service'; +import { BaseUiComponent } from '@app/ui/base/base-ui-component'; const DEFAULT_LOGO = `/assets/img/openslides-logo.svg`; const DEFAULT_LOGO_DARK_THEME = `/assets/img/openslides-logo-dark.svg`; @@ -10,6 +10,7 @@ const DEFAULT_LOGO_DARK_THEME = `/assets/img/openslides-logo-dark.svg`; selector: `os-logo`, templateUrl: `./logo.component.html`, styleUrls: [`./logo.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class LogoComponent extends BaseUiComponent implements OnInit { diff --git a/client/src/app/ui/modules/sidenav/components/sidenav/sidenav.component.ts b/client/src/app/ui/modules/sidenav/components/sidenav/sidenav.component.ts index f4f27e2994..03a011dfee 100644 --- a/client/src/app/ui/modules/sidenav/components/sidenav/sidenav.component.ts +++ b/client/src/app/ui/modules/sidenav/components/sidenav/sidenav.component.ts @@ -1,6 +1,6 @@ -import { Component, ContentChild, inject, Input, TemplateRef, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ContentChild, inject, Input, TemplateRef, ViewChild } from '@angular/core'; import { MatSidenav } from '@angular/material/sidenav'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; +import { ViewPortService } from '@app/site/services/view-port.service'; import { SidenavDrawerContentDirective } from '../../directives/sidenav-drawer-content.directive'; import { SidenavMainContentDirective } from '../../directives/sidenav-main-content.directive'; @@ -9,6 +9,7 @@ import { SidenavMainContentDirective } from '../../directives/sidenav-main-conte selector: `os-sidenav`, templateUrl: `./sidenav.component.html`, styleUrls: [`./sidenav.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class SidenavComponent { diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/components/base-game-dialog/base-game-dialog.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/components/base-game-dialog/base-game-dialog.ts index 979ad22391..d4b8fbc208 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/components/base-game-dialog/base-game-dialog.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/components/base-game-dialog/base-game-dialog.ts @@ -1,9 +1,9 @@ import { Directive, inject, OnDestroy, OnInit } from '@angular/core'; +import { NotifyResponse, NotifyService } from '@app/gateways/notify.service'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; +import { OperatorService } from '@app/site/services/operator.service'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; -import { NotifyResponse, NotifyService } from 'src/app/gateways/notify.service'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; -import { OperatorService } from 'src/app/site/services/operator.service'; /** * All states for the statemachine diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/components/easter-egg-content-platform-dialog/easter-egg-content-platform-dialog.component.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/components/easter-egg-content-platform-dialog/easter-egg-content-platform-dialog.component.ts index aff357b5f6..efcfd49faa 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/components/easter-egg-content-platform-dialog/easter-egg-content-platform-dialog.component.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/components/easter-egg-content-platform-dialog/easter-egg-content-platform-dialog.component.ts @@ -1,5 +1,5 @@ import { ComponentPortal, ComponentType } from '@angular/cdk/portal'; -import { Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { C4DialogModule } from '../../modules/c4-dialog'; import { ChessDialogModule } from '../../modules/chess-dialog'; @@ -13,6 +13,7 @@ interface EasterEggModuleDescription { selector: `os-easter-egg-content-platform-dialog`, templateUrl: `./easter-egg-content-platform-dialog.component.html`, styleUrls: [`./easter-egg-content-platform-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class EasterEggContentPlatformDialogComponent { diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/easter-egg.module.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/easter-egg.module.ts index c85a7a7456..657173442f 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/easter-egg.module.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/easter-egg.module.ts @@ -2,9 +2,9 @@ import { PortalModule } from '@angular/cdk/portal'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatDialogModule } from '@angular/material/dialog'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { DirectivesModule } from 'src/app/ui/directives'; -import { GridModule } from 'src/app/ui/modules/grid'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { DirectivesModule } from '@app/ui/directives'; +import { GridModule } from '@app/ui/modules/grid'; import { EasterEggContentPlatformDialogComponent } from './components/easter-egg-content-platform-dialog/easter-egg-content-platform-dialog.component'; diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/c4-dialog.module.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/c4-dialog.module.ts index 20a43bfee5..add003bfdd 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/c4-dialog.module.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/c4-dialog.module.ts @@ -3,7 +3,7 @@ import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { C4DialogComponent } from './components/c4-dialog/c4-dialog.component'; diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/components/c4-dialog/c4-dialog.component.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/components/c4-dialog/c4-dialog.component.ts index 57412d8e73..e7c9eec8c7 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/components/c4-dialog/c4-dialog.component.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/c4-dialog/components/c4-dialog/c4-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { BaseGameDialogComponent, State } from '../../../../components/base-game-dialog/base-game-dialog'; @@ -25,6 +25,7 @@ enum BoardStatus { selector: `os-c4-dialog`, templateUrl: `./c4-dialog.component.html`, styleUrls: [`./c4-dialog.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class C4DialogComponent extends BaseGameDialogComponent implements OnInit { diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/chess-dialog.module.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/chess-dialog.module.ts index 3e20773172..d6d5ac6ecf 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/chess-dialog.module.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/chess-dialog.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { ChessDialogComponent } from './components/chess-dialog/chess-dialog.component'; diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/components/chess-dialog/chess-dialog.component.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/components/chess-dialog/chess-dialog.component.ts index 3b441a502d..b868b5533a 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/components/chess-dialog/chess-dialog.component.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/components/chess-dialog/chess-dialog.component.ts @@ -1,10 +1,18 @@ -import { Component, ElementRef, Inject, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + ElementRef, + Inject, + OnInit, + ViewChild, + ViewEncapsulation +} from '@angular/core'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { Id } from '@app/domain/definitions/key-types'; +import { NotifyResponse } from '@app/gateways/notify.service'; import { Chess, EVENT_TYPE } from 'cm-chess/src/Chess'; import { BORDER_TYPE, Chessboard, COLOR, FEN, INPUT_EVENT_TYPE } from 'cm-chessboard/src/Chessboard'; import { PromotionDialog } from 'cm-chessboard/src/extensions/promotion-dialog/PromotionDialog'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { NotifyResponse } from 'src/app/gateways/notify.service'; import { BaseGameDialogComponent, State } from '../../../../components/base-game-dialog/base-game-dialog'; @@ -18,6 +26,7 @@ interface ChessDialogConfig { templateUrl: `./chess-dialog.component.html`, styleUrls: [`./chess-dialog.component.scss`], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class ChessDialogComponent extends BaseGameDialogComponent implements OnInit { diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service.ts index c6440a2aef..cde5da710c 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service.ts @@ -1,9 +1,9 @@ import { inject, Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; +import { NotifyResponse, NotifyService } from '@app/gateways/notify.service'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { PromptService } from '@app/ui/modules/prompt-dialog'; import { TranslateService } from '@ngx-translate/core'; -import { NotifyResponse, NotifyService } from 'src/app/gateways/notify.service'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { PromptService } from 'src/app/ui/modules/prompt-dialog'; import { ChessDialogModule } from '../chess-dialog.module'; diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/services/easter-egg-content-platform.service.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/services/easter-egg-content-platform.service.ts index 6717f14362..1538510b22 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/services/easter-egg-content-platform.service.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/services/easter-egg-content-platform.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { mediumDialogSettings } from 'src/app/infrastructure/utils/dialog-settings'; -import { BaseDialogService } from 'src/app/ui/base/base-dialog-service'; +import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; +import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { EasterEggContentPlatformDialogComponent } from '../components/easter-egg-content-platform-dialog/easter-egg-content-platform-dialog.component'; diff --git a/client/src/app/ui/modules/sidenav/sidenav.module.ts b/client/src/app/ui/modules/sidenav/sidenav.module.ts index 722d55ffcc..692497baef 100644 --- a/client/src/app/ui/modules/sidenav/sidenav.module.ts +++ b/client/src/app/ui/modules/sidenav/sidenav.module.ts @@ -8,7 +8,7 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatSidenavModule } from '@angular/material/sidenav'; import { MatTooltipModule } from '@angular/material/tooltip'; import { RouterModule } from '@angular/router'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { PipesModule } from '../../pipes/pipes.module'; import { CopyrightSignComponent } from './components/copyright-sign/copyright-sign.component'; diff --git a/client/src/app/ui/modules/sorting/modules/sorting-list/components/sorting-list/sorting-list.component.ts b/client/src/app/ui/modules/sorting/modules/sorting-list/components/sorting-list/sorting-list.component.ts index 948d90b274..82aa7ef035 100644 --- a/client/src/app/ui/modules/sorting/modules/sorting-list/components/sorting-list/sorting-list.component.ts +++ b/client/src/app/ui/modules/sorting/modules/sorting-list/components/sorting-list/sorting-list.component.ts @@ -1,13 +1,23 @@ import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; -import { Component, ContentChild, EventEmitter, Input, OnDestroy, Output, TemplateRef } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + ContentChild, + EventEmitter, + Input, + OnDestroy, + Output, + TemplateRef +} from '@angular/core'; +import { Selectable } from '@app/domain/interfaces/selectable'; +import { Mutex } from '@app/infrastructure/utils/promises'; import { Observable, Subscription } from 'rxjs'; -import { Selectable } from 'src/app/domain/interfaces/selectable'; -import { Mutex } from 'src/app/infrastructure/utils/promises'; @Component({ selector: `os-sorting-list`, templateUrl: `./sorting-list.component.html`, styleUrls: [`./sorting-list.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class SortingListComponent implements OnDestroy { diff --git a/client/src/app/ui/modules/sorting/modules/sorting-list/sorting-list.module.ts b/client/src/app/ui/modules/sorting/modules/sorting-list/sorting-list.module.ts index 79b616462a..23e778cbcb 100644 --- a/client/src/app/ui/modules/sorting/modules/sorting-list/sorting-list.module.ts +++ b/client/src/app/ui/modules/sorting/modules/sorting-list/sorting-list.module.ts @@ -2,7 +2,7 @@ import { DragDropModule } from '@angular/cdk/drag-drop'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { SortingListComponent } from './components/sorting-list/sorting-list.component'; diff --git a/client/src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component.ts b/client/src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component.ts index 6a5216165f..5b37e3e994 100644 --- a/client/src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component.ts +++ b/client/src/app/ui/modules/sorting/modules/sorting-tree/components/sorting-tree/sorting-tree.component.ts @@ -1,12 +1,22 @@ import { ArrayDataSource } from '@angular/cdk/collections'; import { CdkDragMove, CdkDragSortEvent, CdkDragStart } from '@angular/cdk/drag-drop'; import { FlatTreeControl } from '@angular/cdk/tree'; -import { Component, ContentChild, EventEmitter, inject, Input, OnDestroy, Output, TemplateRef } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + ContentChild, + EventEmitter, + inject, + Input, + OnDestroy, + Output, + TemplateRef +} from '@angular/core'; +import { Displayable, Identifiable } from '@app/domain/interfaces'; +import { FlatNode, TreeIdNode } from '@app/infrastructure/definitions/tree'; +import { findIndexInSortedArray } from '@app/infrastructure/utils'; +import { SortDefinition } from '@app/site/base/base-sort.service'; import { auditTime, Observable, Subscription } from 'rxjs'; -import { Displayable, Identifiable } from 'src/app/domain/interfaces'; -import { FlatNode, TreeIdNode } from 'src/app/infrastructure/definitions/tree'; -import { findIndexInSortedArray } from 'src/app/infrastructure/utils'; -import { SortDefinition } from 'src/app/site/base/base-sort.service'; import { TreeService, TreeSortService } from '../../services'; @@ -58,6 +68,7 @@ class Movement { selector: `os-sorting-tree`, templateUrl: `./sorting-tree.component.html`, styleUrls: [`./sorting-tree.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class SortingTreeComponent implements OnDestroy { diff --git a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree-sort.service.spec.ts b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree-sort.service.spec.ts index 6c7f396b9c..c9276c3f03 100644 --- a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree-sort.service.spec.ts +++ b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree-sort.service.spec.ts @@ -1,9 +1,9 @@ import { TestBed } from '@angular/core/testing'; +import { Id } from '@app/domain/definitions/key-types'; +import { Displayable, Identifiable } from '@app/domain/interfaces'; +import { FlatNode, isFlatNode } from '@app/infrastructure/definitions/tree'; +import { MockTranslateService } from '@app/site/pages/meetings/modules/poll/pipes/poll-parse-number/poll-parse-number.pipe.spec'; import { TranslateService } from '@ngx-translate/core'; -import { Id } from 'src/app/domain/definitions/key-types'; -import { Displayable, Identifiable } from 'src/app/domain/interfaces'; -import { FlatNode, isFlatNode } from 'src/app/infrastructure/definitions/tree'; -import { MockTranslateService } from 'src/app/site/pages/meetings/modules/poll/pipes/poll-parse-number/poll-parse-number.pipe.spec'; import { TreeService } from './tree.service'; import { TreeSortService } from './tree-sort.service'; diff --git a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree-sort.service.ts b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree-sort.service.ts index a4ed0d2e7b..259081dbb5 100644 --- a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree-sort.service.ts +++ b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree-sort.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Displayable, Identifiable } from 'src/app/domain/interfaces'; -import { FlatNode } from 'src/app/infrastructure/definitions/tree'; -import { BaseSortService, OsSortProperty } from 'src/app/site/base/base-sort.service'; +import { Displayable, Identifiable } from '@app/domain/interfaces'; +import { FlatNode } from '@app/infrastructure/definitions/tree'; +import { BaseSortService, OsSortProperty } from '@app/site/base/base-sort.service'; /** * Sorting service for trees. diff --git a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts index 021ffac86b..32166d3793 100644 --- a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts +++ b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import { Displayable, Identifiable } from 'src/app/domain/interfaces'; -import { FlatNode, OSTreeNode, TreeIdNode, TreeNodeWithoutItem } from 'src/app/infrastructure/definitions/tree'; -import { findIndexInSortedArray } from 'src/app/infrastructure/utils'; +import { Displayable, Identifiable } from '@app/domain/interfaces'; +import { FlatNode, OSTreeNode, TreeIdNode, TreeNodeWithoutItem } from '@app/infrastructure/definitions/tree'; +import { findIndexInSortedArray } from '@app/infrastructure/utils'; @Injectable({ providedIn: `root` diff --git a/client/src/app/ui/modules/spinner/components/spinner/spinner.component.ts b/client/src/app/ui/modules/spinner/components/spinner/spinner.component.ts index 5a41af4d67..44e41edeb6 100644 --- a/client/src/app/ui/modules/spinner/components/spinner/spinner.component.ts +++ b/client/src/app/ui/modules/spinner/components/spinner/spinner.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { _ } from '@ngx-translate/core'; /** @@ -8,6 +8,7 @@ import { _ } from '@ngx-translate/core'; selector: `os-spinner`, templateUrl: `./spinner.component.html`, styleUrls: [`./spinner.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class SpinnerComponent { diff --git a/client/src/app/ui/modules/spinner/spinner.module.ts b/client/src/app/ui/modules/spinner/spinner.module.ts index 94b94c75fe..a25ca0fed8 100644 --- a/client/src/app/ui/modules/spinner/spinner.module.ts +++ b/client/src/app/ui/modules/spinner/spinner.module.ts @@ -1,6 +1,6 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { OpenSlidesTranslationModule } from 'src/app/site/modules/translations'; +import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { SpinnerComponent } from './components/spinner/spinner.component'; diff --git a/client/src/app/ui/modules/vertical-tab-group/components/vertical-tab-group/vertical-tab-group.component.ts b/client/src/app/ui/modules/vertical-tab-group/components/vertical-tab-group/vertical-tab-group.component.ts index 65d0e8bae8..8b54d2495c 100644 --- a/client/src/app/ui/modules/vertical-tab-group/components/vertical-tab-group/vertical-tab-group.component.ts +++ b/client/src/app/ui/modules/vertical-tab-group/components/vertical-tab-group/vertical-tab-group.component.ts @@ -1,5 +1,6 @@ import { TemplatePortal } from '@angular/cdk/portal'; import { + ChangeDetectionStrategy, Component, ContentChild, ContentChildren, @@ -10,8 +11,8 @@ import { TemplateRef } from '@angular/core'; import { MatTab } from '@angular/material/tabs'; +import { ViewPortService } from '@app/site/services/view-port.service'; import { BehaviorSubject, Observable } from 'rxjs'; -import { ViewPortService } from 'src/app/site/services/view-port.service'; import { VerticalTabGroupContentState } from '../../definitions'; import { VerticalTabGroupLabelHeaderDirective } from '../../directives/vertical-tab-group-label-header.directive'; @@ -20,6 +21,7 @@ import { VerticalTabGroupLabelHeaderDirective } from '../../directives/vertical- selector: `os-vertical-tab-group`, templateUrl: `./vertical-tab-group.component.html`, styleUrls: [`./vertical-tab-group.component.scss`], + changeDetection: ChangeDetectionStrategy.Eager, standalone: false }) export class VerticalTabGroupComponent { diff --git a/client/src/app/ui/pipes/localized-date-range/localized-date-range.pipe.spec.ts b/client/src/app/ui/pipes/localized-date-range/localized-date-range.pipe.spec.ts index bb079f4de1..a5c08424f8 100644 --- a/client/src/app/ui/pipes/localized-date-range/localized-date-range.pipe.spec.ts +++ b/client/src/app/ui/pipes/localized-date-range/localized-date-range.pipe.spec.ts @@ -1,5 +1,7 @@ import { ChangeDetectorRef } from '@angular/core'; import { TestBed } from '@angular/core/testing'; +import { langToTimeLocale } from '@app/infrastructure/utils'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; import { TranslateService } from '@ngx-translate/core'; import * as cs from 'date-fns/locale/cs'; import * as de from 'date-fns/locale/de'; @@ -7,8 +9,6 @@ import * as enUS from 'date-fns/locale/en-US'; import * as es from 'date-fns/locale/es'; import * as ita from 'date-fns/locale/it'; import * as ru from 'date-fns/locale/ru'; -import { langToTimeLocale } from 'src/app/infrastructure/utils'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; import { LocalizedDateRangePipe } from './localized-date-range.pipe'; diff --git a/client/src/app/ui/pipes/localized-date-range/localized-date-range.pipe.ts b/client/src/app/ui/pipes/localized-date-range/localized-date-range.pipe.ts index 7df95a8a5a..43c0bb3234 100644 --- a/client/src/app/ui/pipes/localized-date-range/localized-date-range.pipe.ts +++ b/client/src/app/ui/pipes/localized-date-range/localized-date-range.pipe.ts @@ -1,8 +1,8 @@ import { ChangeDetectorRef, inject, Pipe, PipeTransform } from '@angular/core'; +import { TimeZoneService } from '@app/site/services/time-zone.service'; import { tzName } from '@date-fns/tz'; import { Locale } from 'date-fns'; import { DateFnsConfigurationService, DateFnsInputDate, FormatPipe } from 'ngx-date-fns'; -import { TimeZoneService } from 'src/app/site/services/time-zone.service'; @Pipe({ name: `localizedDateRange`, diff --git a/client/src/app/ui/pipes/localized-date/localized-date.pipe.spec.ts b/client/src/app/ui/pipes/localized-date/localized-date.pipe.spec.ts index 2d20a31945..0ad22cb45e 100644 --- a/client/src/app/ui/pipes/localized-date/localized-date.pipe.spec.ts +++ b/client/src/app/ui/pipes/localized-date/localized-date.pipe.spec.ts @@ -1,7 +1,7 @@ import { ChangeDetectorRef } from '@angular/core'; import { TestBed } from '@angular/core/testing'; +import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; import { TranslateService } from '@ngx-translate/core'; -import { ActiveMeetingService } from 'src/app/site/pages/meetings/services/active-meeting.service'; import { LocalizedDatePipe } from './localized-date.pipe'; diff --git a/client/src/app/ui/pipes/localized-date/localized-date.pipe.ts b/client/src/app/ui/pipes/localized-date/localized-date.pipe.ts index fa78586473..69744dd48f 100644 --- a/client/src/app/ui/pipes/localized-date/localized-date.pipe.ts +++ b/client/src/app/ui/pipes/localized-date/localized-date.pipe.ts @@ -1,7 +1,7 @@ import { ChangeDetectorRef, inject, Pipe, PipeTransform } from '@angular/core'; +import { TimeZoneService } from '@app/site/services/time-zone.service'; import { TZDate, tzName } from '@date-fns/tz'; import { DateFnsConfigurationService, FormatPipe } from 'ngx-date-fns'; -import { TimeZoneService } from 'src/app/site/services/time-zone.service'; @Pipe({ name: `localizedDate`, diff --git a/client/src/app/ui/pipes/time/time.pipe.spec.ts b/client/src/app/ui/pipes/time/time.pipe.spec.ts index d44cd85a62..6cbd1d2ad9 100644 --- a/client/src/app/ui/pipes/time/time.pipe.spec.ts +++ b/client/src/app/ui/pipes/time/time.pipe.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; +import { MockTranslateService } from '@app/site/pages/meetings/modules/poll/pipes/poll-parse-number/poll-parse-number.pipe.spec'; import { TranslateService } from '@ngx-translate/core'; -import { MockTranslateService } from 'src/app/site/pages/meetings/modules/poll/pipes/poll-parse-number/poll-parse-number.pipe.spec'; import { TimePipe } from './time.pipe'; diff --git a/client/src/app/worker/autoupdate/autoupdate-stream-pool.ts b/client/src/app/worker/autoupdate/autoupdate-stream-pool.ts index 6e224a325c..08fc470d53 100644 --- a/client/src/app/worker/autoupdate/autoupdate-stream-pool.ts +++ b/client/src/app/worker/autoupdate/autoupdate-stream-pool.ts @@ -1,4 +1,4 @@ -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; import { ModelRequest } from '../../domain/interfaces/model-request'; import { WorkerHttpAuth } from '../http/auth'; diff --git a/client/src/app/worker/autoupdate/autoupdate-subscription.ts b/client/src/app/worker/autoupdate/autoupdate-subscription.ts index f3796953fc..440c8532bb 100644 --- a/client/src/app/worker/autoupdate/autoupdate-subscription.ts +++ b/client/src/app/worker/autoupdate/autoupdate-subscription.ts @@ -1,4 +1,4 @@ -import { FieldDescriptor, Fields, HasFields, ModelRequest } from 'src/app/domain/interfaces/model-request'; +import { FieldDescriptor, Fields, HasFields, ModelRequest } from '@app/domain/interfaces/model-request'; import { AutoupdateStream } from './autoupdate-stream'; import { AutoupdateReceiveData, AutoupdateReceiveError, AutoupdateSetStreamId } from './interfaces-autoupdate'; diff --git a/client/src/app/worker/autoupdate/interfaces-autoupdate.ts b/client/src/app/worker/autoupdate/interfaces-autoupdate.ts index f92f733ec5..822ce5db49 100644 --- a/client/src/app/worker/autoupdate/interfaces-autoupdate.ts +++ b/client/src/app/worker/autoupdate/interfaces-autoupdate.ts @@ -1,4 +1,4 @@ -import { HttpMethod } from 'src/app/infrastructure/definitions/http'; +import { HttpMethod } from '@app/infrastructure/definitions/http'; import { Id } from '../../domain/definitions/key-types'; import { WorkerMessageContent } from '../interfaces'; diff --git a/client/src/app/worker/http/auth.spec.ts b/client/src/app/worker/http/auth.spec.ts index 329041ca2f..ac0527d1c9 100644 --- a/client/src/app/worker/http/auth.spec.ts +++ b/client/src/app/worker/http/auth.spec.ts @@ -1,6 +1,6 @@ import fetchMock from 'fetch-mock'; -import { environment } from 'src/environments/environment'; +import { environment } from '../../../environments/environment'; import { WorkerHttpAuth } from './auth'; const AUTH_TOKENS = { diff --git a/client/src/app/worker/http/auth.ts b/client/src/app/worker/http/auth.ts index 1400edc761..e1a7326e52 100644 --- a/client/src/app/worker/http/auth.ts +++ b/client/src/app/worker/http/auth.ts @@ -1,5 +1,6 @@ -import { Id } from 'src/app/domain/definitions/key-types'; -import { environment } from 'src/environments/environment'; +import { Id } from '@app/domain/definitions/key-types'; + +import { environment } from '../../../environments/environment'; export class WorkerHttpAuth { private serverTimeOffset = 0; diff --git a/client/src/app/worker/http/http-stream-pool.spec.ts b/client/src/app/worker/http/http-stream-pool.spec.ts index ad915ab3d0..b603a16698 100644 --- a/client/src/app/worker/http/http-stream-pool.spec.ts +++ b/client/src/app/worker/http/http-stream-pool.spec.ts @@ -1,5 +1,5 @@ +import { HttpMethod } from '@app/infrastructure/definitions/http'; import fetchMock from 'fetch-mock'; -import { HttpMethod } from 'src/app/infrastructure/definitions/http'; import { AutoupdateSetEndpointParams } from '../autoupdate/interfaces-autoupdate'; import { HttpStream } from './http-stream'; diff --git a/client/src/app/worker/http/http-stream.spec.ts b/client/src/app/worker/http/http-stream.spec.ts index 9bc85126fc..cdbe4115f0 100644 --- a/client/src/app/worker/http/http-stream.spec.ts +++ b/client/src/app/worker/http/http-stream.spec.ts @@ -1,4 +1,4 @@ -import { HttpMethod } from 'src/app/infrastructure/definitions/http'; +import { HttpMethod } from '@app/infrastructure/definitions/http'; import { AutoupdateSetEndpointParams } from '../autoupdate/interfaces-autoupdate'; import { HttpStream } from './http-stream'; diff --git a/client/src/app/worker/http/http-subscription-polling.spec.ts b/client/src/app/worker/http/http-subscription-polling.spec.ts index 4d343defb8..c164cb4afd 100644 --- a/client/src/app/worker/http/http-subscription-polling.spec.ts +++ b/client/src/app/worker/http/http-subscription-polling.spec.ts @@ -1,5 +1,5 @@ +import { HttpMethod } from '@app/infrastructure/definitions/http'; import fetchMock from 'fetch-mock'; -import { HttpMethod } from 'src/app/infrastructure/definitions/http'; import { HttpSubscriptionEndpoint } from './http-subscription'; import { HttpSubscriptionPolling, POLLING_INTERVAL } from './http-subscription-polling'; diff --git a/client/src/app/worker/http/http-subscription-sse.spec.ts b/client/src/app/worker/http/http-subscription-sse.spec.ts index ed17bafc9e..cf2c32ff0b 100644 --- a/client/src/app/worker/http/http-subscription-sse.spec.ts +++ b/client/src/app/worker/http/http-subscription-sse.spec.ts @@ -1,6 +1,5 @@ +import { HttpMethod } from '@app/infrastructure/definitions/http'; import fetchMock from 'fetch-mock'; -import { NormalizedRequestOptions } from 'node_modules/fetch-mock/dist/esm/RequestUtils'; -import { HttpMethod } from 'src/app/infrastructure/definitions/http'; import { HttpSubscriptionEndpoint } from './http-subscription'; import { HttpSubscriptionSSE } from './http-subscription-sse'; @@ -19,7 +18,7 @@ function getHttpSubscriptionSSEInstance(url = `/`, onData: any = () => {}, onErr return new HttpSubscriptionSSE(endpointConfig, handlerConfig); } -function getValidStream(req: NormalizedRequestOptions, interval: number, resolveAfter = -1) { +function getValidStream(req: any, interval: number, resolveAfter = -1) { let cnt = 0; let abort = false; const textEncoder = new TextEncoder(); diff --git a/client/src/app/worker/http/http-subscription-sse.ts b/client/src/app/worker/http/http-subscription-sse.ts index fdef4991a1..2b31acfd65 100644 --- a/client/src/app/worker/http/http-subscription-sse.ts +++ b/client/src/app/worker/http/http-subscription-sse.ts @@ -1,4 +1,4 @@ -import { joinTypedArrays, splitTypedArray } from 'src/app/infrastructure/utils'; +import { joinTypedArrays, splitTypedArray } from '@app/infrastructure/utils'; import { HttpSubscription } from './http-subscription'; diff --git a/client/src/app/worker/http/http-subscription.ts b/client/src/app/worker/http/http-subscription.ts index 95151458e7..9de34e001d 100644 --- a/client/src/app/worker/http/http-subscription.ts +++ b/client/src/app/worker/http/http-subscription.ts @@ -1,4 +1,4 @@ -import { HttpMethod } from 'src/app/infrastructure/definitions/http'; +import { HttpMethod } from '@app/infrastructure/definitions/http'; import { ErrorDescription, ErrorType, isCommunicationError } from './stream-utils'; diff --git a/client/src/app/worker/icc/icc-stream-pool.ts b/client/src/app/worker/icc/icc-stream-pool.ts index a176cc5aae..6ddd855ebd 100644 --- a/client/src/app/worker/icc/icc-stream-pool.ts +++ b/client/src/app/worker/icc/icc-stream-pool.ts @@ -1,4 +1,4 @@ -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; import { WorkerHttpAuth } from '../http/auth'; import { HTTP_POOL_CONFIG, HttpStreamPool } from '../http/http-stream-pool'; diff --git a/client/src/app/worker/icc/icc-stream.ts b/client/src/app/worker/icc/icc-stream.ts index 5f3f75439f..0a3efbbaed 100644 --- a/client/src/app/worker/icc/icc-stream.ts +++ b/client/src/app/worker/icc/icc-stream.ts @@ -1,4 +1,4 @@ -import { Id } from 'src/app/domain/definitions/key-types'; +import { Id } from '@app/domain/definitions/key-types'; import { AutoupdateSetEndpointParams } from '../autoupdate/interfaces-autoupdate'; import { HttpStream } from '../http/http-stream'; diff --git a/client/src/app/worker/sw-autoupdate.ts b/client/src/app/worker/sw-autoupdate.ts index 41546531fe..fd70fa2af9 100644 --- a/client/src/app/worker/sw-autoupdate.ts +++ b/client/src/app/worker/sw-autoupdate.ts @@ -1,5 +1,4 @@ -import { environment } from 'src/environments/environment'; - +import { environment } from '../../environments/environment'; import { AutoupdateStreamPool } from './autoupdate/autoupdate-stream-pool'; import { AutoupdateSubscription } from './autoupdate/autoupdate-subscription'; import { diff --git a/client/src/e2e-imports.module.ts b/client/src/e2e-imports.module.ts index 4b8730be30..a889a974d9 100644 --- a/client/src/e2e-imports.module.ts +++ b/client/src/e2e-imports.module.ts @@ -1,5 +1,5 @@ import { APP_BASE_HREF, CommonModule } from '@angular/common'; -import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi, withXhr } from '@angular/common/http'; import { NgModule } from '@angular/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -26,6 +26,6 @@ import { OpenSlidesTranslationModule } from './app/site/modules/translations'; BrowserAnimationsModule, OpenSlidesMainRoutingModule ], - providers: [{ provide: APP_BASE_HREF, useValue: `/` }, provideHttpClient(withInterceptorsFromDi())] + providers: [{ provide: APP_BASE_HREF, useValue: `/` }, provideHttpClient(withXhr(), withInterceptorsFromDi())] }) export class E2EImportsModule {} diff --git a/client/src/testing/models/test-change-recommendation.ts b/client/src/testing/models/test-change-recommendation.ts index ee1af835e0..6840bb367b 100644 --- a/client/src/testing/models/test-change-recommendation.ts +++ b/client/src/testing/models/test-change-recommendation.ts @@ -1,5 +1,5 @@ -import { ModificationType } from 'src/app/domain/models/motions/motions.constants'; -import { ViewUnifiedChange, ViewUnifiedChangeType } from 'src/app/site/pages/meetings/pages/motions'; +import { ModificationType } from '@app/domain/models/motions/motions.constants'; +import { ViewUnifiedChange, ViewUnifiedChangeType } from '@app/site/pages/meetings/pages/motions'; export class TestChangeRecommendation implements ViewUnifiedChange { public id!: number; diff --git a/client/tsconfig.app.json b/client/tsconfig.app.json index 38673a3522..38ffcc9eed 100644 --- a/client/tsconfig.app.json +++ b/client/tsconfig.app.json @@ -4,10 +4,16 @@ "compilerOptions": { "outDir": "./out-tsc/app", "types": [], - "paths": { - "@openslides/motion-diff": ["../packages/openslides-motion-diff"] - } + "rootDir": "./src" }, "files": ["src/main.ts", "src/polyfills.ts"], - "include": ["src/**/*.d.ts"] + "include": ["src/**/*.d.ts"], + "angularCompilerOptions": { + "extendedDiagnostics": { + "checks": { + "nullishCoalescingNotNullable": "suppress", + "optionalChainNotNullable": "suppress" + } + } + } } diff --git a/client/tsconfig.json b/client/tsconfig.json index 5b65ac7bff..cc8ac88906 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -2,7 +2,6 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "declaration": false, "experimentalDecorators": true, "esModuleInterop": true, @@ -15,6 +14,12 @@ "noImplicitReturns": true, "noPropertyAccessFromIndexSignature": true, "outDir": "./dist/out-tsc", + "paths": { + "@openslides/motion-diff": ["../packages/openslides-motion-diff"], + "@app/*": ["./src/app/*"], + "node_modules/chart.js/dist/types/basic": ["./node_modules/chart.js/dist/types/basic"], + "node_modules/chart.js/dist/types/utils": ["./node_modules/chart.js/dist/types/utils"] + }, "sourceMap": true, "strict": false, "target": "ES2022", diff --git a/client/tsconfig.spec.json b/client/tsconfig.spec.json index 092345b02e..31ebb76b7a 100644 --- a/client/tsconfig.spec.json +++ b/client/tsconfig.spec.json @@ -1,18 +1,19 @@ /* To learn more about this file see: https://angular.io/config/tsconfig. */ { - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "./out-tsc/spec", - "types": [ - "jasmine" - ] - }, - "files": [ - "src/test.ts", - "src/polyfills.ts" - ], - "include": [ - "src/**/*.spec.ts", - "src/**/*.d.ts" - ] + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "./out-tsc/spec", + "types": ["jasmine"], + "rootDir": "./src" + }, + "files": ["src/test.ts", "src/polyfills.ts"], + "include": ["src/**/*.spec.ts", "src/**/*.d.ts"], + "angularCompilerOptions": { + "extendedDiagnostics": { + "checks": { + "nullishCoalescingNotNullable": "suppress", + "optionalChainNotNullable": "suppress" + } + } + } } diff --git a/client/tsconfig.worker.json b/client/tsconfig.worker.json index c13d2e4a91..d63539519c 100644 --- a/client/tsconfig.worker.json +++ b/client/tsconfig.worker.json @@ -8,7 +8,8 @@ "es2018", "webworker" ], - "types": [] + "types": [], + "rootDir": "./src/app" }, "include": [ "src/**/*.worker.ts" From 0c27d3451816469e0c2b9e334109d696245e3a33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 12:20:37 +0200 Subject: [PATCH 48/71] Bump ws, engine.io and socket.io-adapter in /client (#6395) --- client/package-lock.json | 73 +++++++++++++--------------------------- 1 file changed, 24 insertions(+), 49 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index b9b7a679ea..eee8bf0135 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -6205,6 +6205,16 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/ws": { + "version": "8.18.1", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", + "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "8.63.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.63.0.tgz", @@ -8179,21 +8189,22 @@ } }, "node_modules/engine.io": { - "version": "6.6.4", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.4.tgz", - "integrity": "sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==", + "version": "6.6.9", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.9.tgz", + "integrity": "sha512-clKkw4C7nJ22mGgoVcCg6V/W/TxdNyIOTr89k2ONZu81qqkddPFDF0LXcbAwhzPD8DjkiRCjzuiO6Y+fkpD4vg==", "dev": true, "license": "MIT", "dependencies": { "@types/cors": "^2.8.12", "@types/node": ">=10.0.0", + "@types/ws": "^8.5.12", "accepts": "~1.3.4", "base64id": "2.0.0", "cookie": "~0.7.2", "cors": "~2.8.5", - "debug": "~4.3.1", + "debug": "~4.4.1", "engine.io-parser": "~5.2.1", - "ws": "~8.17.1" + "ws": "~8.21.0" }, "engines": { "node": ">=10.2.0" @@ -8209,24 +8220,6 @@ "node": ">=10.0.0" } }, - "node_modules/engine.io/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/ent": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.2.tgz", @@ -13794,32 +13787,14 @@ } }, "node_modules/socket.io-adapter": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz", - "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "~4.3.4", - "ws": "~8.17.1" - } - }, - "node_modules/socket.io-adapter/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "version": "2.5.8", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.8.tgz", + "integrity": "sha512-6Oy52pbg+kvdCVvjcN+FnY7BvxZ7cIHNScbvztT/It5d0vbwoJoVZmF2gjJmnV0/4WlXRfG15zc45ySk9Ah8bw==", "dev": true, "license": "MIT", "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } + "debug": "~4.4.1", + "ws": "~8.21.0" } }, "node_modules/socket.io-parser": { @@ -14903,9 +14878,9 @@ "license": "ISC" }, "node_modules/ws": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", - "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", + "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", "dev": true, "license": "MIT", "engines": { From 7484c1b152f26c1fa4f8fbf3f5cb16f95bf03652 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 12:21:27 +0200 Subject: [PATCH 49/71] Bump fast-uri from 3.1.0 to 3.1.3 in /packages/openslides-motion-diff (#6383) --- packages/openslides-motion-diff/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/openslides-motion-diff/package-lock.json b/packages/openslides-motion-diff/package-lock.json index 9bd1479a1e..e6e68eea77 100644 --- a/packages/openslides-motion-diff/package-lock.json +++ b/packages/openslides-motion-diff/package-lock.json @@ -1520,9 +1520,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", - "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.3.tgz", + "integrity": "sha512-i70LwGWUduXqzicKXWshooq+sWL1K3WUU5rKZNG/0i3a1OSoX3HqhH5WbWwTmqWfor4urUakGPiRQcleRZTwOg==", "dev": true, "funding": [ { From edf0b73753b4397453ee8b5fbf5a905d974bb047 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 10:32:05 +0000 Subject: [PATCH 50/71] Bump actions/setup-node from 6 to 7 (#6400) --- .github/workflows/ci-package-motion-diff.yml | 2 +- .github/workflows/continuous-integration.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-package-motion-diff.yml b/.github/workflows/ci-package-motion-diff.yml index fcf090e5ac..da52d93d62 100644 --- a/.github/workflows/ci-package-motion-diff.yml +++ b/.github/workflows/ci-package-motion-diff.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v7 - name: 'Install Node' - uses: actions/setup-node@v6 + uses: actions/setup-node@v7 with: node-version: '22.x' diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 995ad28afc..f809b4d75e 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -106,7 +106,7 @@ jobs: submodules: "recursive" - name: Set up Node.js - uses: actions/setup-node@v6 + uses: actions/setup-node@v7 with: node-version: '24' From 3d69e2e8ac2942b42369f9c385b1874ad931a8be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 12:32:50 +0200 Subject: [PATCH 51/71] Bump the typescript-eslint group in /client with 3 updates (#6401) --- client/package-lock.json | 128 +++++++++++++++++++-------------------- client/package.json | 6 +- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index eee8bf0135..1f4a6e3f9f 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -92,8 +92,8 @@ "@types/qrcode": "^1.5.6", "@types/tinycolor2": "^1.4.6", "@types/video.js": "^7.3.58", - "@typescript-eslint/eslint-plugin": "^8.63.0", - "@typescript-eslint/parser": "^8.63.0", + "@typescript-eslint/eslint-plugin": "^8.64.0", + "@typescript-eslint/parser": "^8.64.0", "@vendure/ngx-translate-extract": "^10.2.0", "angular-eslint": "^22.1.0", "eslint": "^9.39.4", @@ -116,7 +116,7 @@ "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^6.0.3", - "typescript-eslint": "^8.63.0" + "typescript-eslint": "^8.64.0" } }, "../packages/openslides-motion-diff": { @@ -6216,17 +6216,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.63.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.63.0.tgz", - "integrity": "sha512-rvwSgqT+DHpWdzfSzPatRLm02a0GlESt++9iy3hLCDY4BgkaLcl8LBi9Yh7XGFBpwcBE/K3024QuXWTpbz4FfQ==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.64.0.tgz", + "integrity": "sha512-CGvQPBxN3wZLu6Rz2kFUpZeoCm78xUic92ck39KPePkO1NPOwjCqdQnm5Q87tpWw9vcBvW8XLrDXjH9PWYtJ3Q==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.63.0", - "@typescript-eslint/type-utils": "8.63.0", - "@typescript-eslint/utils": "8.63.0", - "@typescript-eslint/visitor-keys": "8.63.0", + "@typescript-eslint/scope-manager": "8.64.0", + "@typescript-eslint/type-utils": "8.64.0", + "@typescript-eslint/utils": "8.64.0", + "@typescript-eslint/visitor-keys": "8.64.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -6239,22 +6239,22 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.63.0", + "@typescript-eslint/parser": "^8.64.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.63.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.63.0.tgz", - "integrity": "sha512-gwh4gvvlaVDKKxyfxMG+Gnu1u9X0OQBwyGLkbwB65dIzBKnxeRiJlNFqlI3zwVhNXJIs6qV7mlFCn/BIajlVig==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.64.0.tgz", + "integrity": "sha512-KA0OshtlcCCXmbfqyZkM5pV3/WNraJf7DkJRLpyrmwPtud57H5BDX7C3k0LPSPxpprfRL+cJDGabF10mvNCoCw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.63.0", - "@typescript-eslint/types": "8.63.0", - "@typescript-eslint/typescript-estree": "8.63.0", - "@typescript-eslint/visitor-keys": "8.63.0", + "@typescript-eslint/scope-manager": "8.64.0", + "@typescript-eslint/types": "8.64.0", + "@typescript-eslint/typescript-estree": "8.64.0", + "@typescript-eslint/visitor-keys": "8.64.0", "debug": "^4.4.3" }, "engines": { @@ -6270,14 +6270,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.63.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.63.0.tgz", - "integrity": "sha512-e5dh0/UI0ok53AlZ5wRkXCB32z/f2jUZqPR/ygAw5WYaSw8j9EoJWlS7wQjr/dmOaqWjnPIn2m+HhVPCMWGZVQ==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.64.0.tgz", + "integrity": "sha512-tk4WpOJ6IEbGrVHaNmM0YRrwAD3exZlIK3iadQNAxh4YKk6jvUQ4ecq18n+v7+meh+cJ3j+D8nbk8sRKhlwLQg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.63.0", - "@typescript-eslint/types": "^8.63.0", + "@typescript-eslint/tsconfig-utils": "^8.64.0", + "@typescript-eslint/types": "^8.64.0", "debug": "^4.4.3" }, "engines": { @@ -6292,14 +6292,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.63.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.63.0.tgz", - "integrity": "sha512-uUyfMWCnDSN8bCpcrY8nGP2BLkQ9Xn0GsipcONcpIDWhwhO4ZSyHvyS14U3X75mzxWxL3I2UZIrenTzdzcJO8A==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.64.0.tgz", + "integrity": "sha512-CXEaFdYXjSTgKhisNkwCcJwTP8Pl+fmRrEQrri4nm3vU743bALrxzLmq7fHG/7e6a5xO0lDYeURpZmBuhHk54w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.63.0", - "@typescript-eslint/visitor-keys": "8.63.0" + "@typescript-eslint/types": "8.64.0", + "@typescript-eslint/visitor-keys": "8.64.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6310,9 +6310,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.63.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.63.0.tgz", - "integrity": "sha512-sUAbkulqBAsncKnbRP3+7CtQFRKicexnj7ZwNC6ddCR7EmrXvjvdCYMJbUIqMd6lwoEriZjwLo08aS5tSjVMHg==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.64.0.tgz", + "integrity": "sha512-2yo8rRNKuzbVWQp5kslhANqZ2uDAeROQHBRZNPu8JDsHmeFNj/XJJhX/FhNUWmkHHvoNsKa6+tHJiig87EzsQw==", "dev": true, "license": "MIT", "engines": { @@ -6327,15 +6327,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.63.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.63.0.tgz", - "integrity": "sha512-Nzzh/OGxVCOjObjaj1CQF2RUasyYy2Jfuh+zZ3PjLzG2fYRriAiZLib9UKtO+CpQAS3YHiAS+ckZDclwqI1TPA==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.64.0.tgz", + "integrity": "sha512-XWG4Fmmv/6SvyS9nH8jWrKs6terwJvE8cyRt1CzYYqzp9OrPhCT4cMc/f7C6RZCwG+qMmiffJS1/qJP8G1URtg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.63.0", - "@typescript-eslint/typescript-estree": "8.63.0", - "@typescript-eslint/utils": "8.63.0", + "@typescript-eslint/types": "8.64.0", + "@typescript-eslint/typescript-estree": "8.64.0", + "@typescript-eslint/utils": "8.64.0", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -6352,9 +6352,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.63.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.63.0.tgz", - "integrity": "sha512-xyLtl9DUBBFrcJS4x2pIqGLH68/tC2uOa4Z7pUteW09D3bXnnXUom4dyPikzWgB7llmIc1zoeI3aoUdC4rPK/Q==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.64.0.tgz", + "integrity": "sha512-qjhfuTfLXjA4IOzXvz0rTjT01BqEiIgPoUeMwiEjnaHKJMTNo8rH5pYW1a2L/0Dnux2fPC85AeyJoWaGa8WxTA==", "dev": true, "license": "MIT", "engines": { @@ -6366,16 +6366,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.63.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.63.0.tgz", - "integrity": "sha512-ygBkU+B7ex5UI/gKhaqexWev79uISfIv7XQCRNYO/jmD8rGLPyWLAb3KMRT6nd8Gt9bmUBi9+iX6tBdYfOY81Q==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.64.0.tgz", + "integrity": "sha512-Pztpsn1aCE1oWDvDEfUk31nngvvF7vUB5SwHFEaZIFpvw7WJtqUHHL4plBZDA9HfWJJjL13BdG0YrJInTUvoVA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.63.0", - "@typescript-eslint/tsconfig-utils": "8.63.0", - "@typescript-eslint/types": "8.63.0", - "@typescript-eslint/visitor-keys": "8.63.0", + "@typescript-eslint/project-service": "8.64.0", + "@typescript-eslint/tsconfig-utils": "8.64.0", + "@typescript-eslint/types": "8.64.0", + "@typescript-eslint/visitor-keys": "8.64.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -6394,16 +6394,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.63.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.63.0.tgz", - "integrity": "sha512-fUKaeAvrTuQg/Tgt3nliAUSZHJM6DlCcfyEmxCvlX8kieWSStBX+5O5Fnidtc3i2JrH+9c/GL4RY2iasd/GPTA==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.64.0.tgz", + "integrity": "sha512-aJUGVB3+U0htrrCjoA8qukw8cm8fNCGAxK/tVoS70k8aeb7DETKeFozRiVFIwEeN9WJLsjaP3ph8I60tY2XZoQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.63.0", - "@typescript-eslint/types": "8.63.0", - "@typescript-eslint/typescript-estree": "8.63.0" + "@typescript-eslint/scope-manager": "8.64.0", + "@typescript-eslint/types": "8.64.0", + "@typescript-eslint/typescript-estree": "8.64.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6418,13 +6418,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.63.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.63.0.tgz", - "integrity": "sha512-UexrHGnGTpbuQHct2ExOc2ZcFbGUS9FOesCxxqdBGcpI1BxYu/LZ6U8Aq6/72XtF/qRBk9nhuGHFJIXXMhPMdw==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.64.0.tgz", + "integrity": "sha512-mrtuL8Nsn6gi2H4mo5KMTp823M+3Q19Ew/i+Zlikq20tIMm99C3Ez0dCmkWWnxut20esQvTg8aUSEhMcAOXhEw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.63.0", + "@typescript-eslint/types": "8.64.0", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -14357,16 +14357,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.63.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.63.0.tgz", - "integrity": "sha512-xgwXyzG4sK9ALkBxbyGkTMMOS+imnW65iPhxCQMK83KhxyoDNW7l+IDqEf9vMdoUidHpOoS967RCq4eMiTexwQ==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.64.0.tgz", + "integrity": "sha512-0qg+pDNMnqYzqH9AnNK+39tejHvsShUOUUoRUgtnTGE7QuMZhiFDnozq8nHJVq+Wae6NMLKNWLg5WmkcC/ndyQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.63.0", - "@typescript-eslint/parser": "8.63.0", - "@typescript-eslint/typescript-estree": "8.63.0", - "@typescript-eslint/utils": "8.63.0" + "@typescript-eslint/eslint-plugin": "8.64.0", + "@typescript-eslint/parser": "8.64.0", + "@typescript-eslint/typescript-estree": "8.64.0", + "@typescript-eslint/utils": "8.64.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" diff --git a/client/package.json b/client/package.json index 40222c6010..e2905fa729 100644 --- a/client/package.json +++ b/client/package.json @@ -115,8 +115,8 @@ "@types/qrcode": "^1.5.6", "@types/tinycolor2": "^1.4.6", "@types/video.js": "^7.3.58", - "@typescript-eslint/eslint-plugin": "^8.63.0", - "@typescript-eslint/parser": "^8.63.0", + "@typescript-eslint/eslint-plugin": "^8.64.0", + "@typescript-eslint/parser": "^8.64.0", "@vendure/ngx-translate-extract": "^10.2.0", "angular-eslint": "^22.1.0", "eslint": "^9.39.4", @@ -139,7 +139,7 @@ "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^6.0.3", - "typescript-eslint": "^8.63.0" + "typescript-eslint": "^8.64.0" }, "browser": { "fs": false From a5af62bed57e29eb92a2bb3de5bd8cdde3166ca1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 10:35:47 +0000 Subject: [PATCH 52/71] Bump prettier from 3.9.4 to 3.9.5 in /client (#6404) --- client/package-lock.json | 8 ++++---- client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 1f4a6e3f9f..bebe01a0c3 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -110,7 +110,7 @@ "karma-coverage": "~2.2.1", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.2.0", - "prettier": "^3.9.4", + "prettier": "^3.9.5", "ts-dedent": "^2.3.0", "ts-morph": "^28.0.0", "ts-node": "^10.9.2", @@ -12623,9 +12623,9 @@ } }, "node_modules/prettier": { - "version": "3.9.4", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.4.tgz", - "integrity": "sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==", + "version": "3.9.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.5.tgz", + "integrity": "sha512-/FVl766LpUfB5vXgCYOYa0MeV/441Ia99AeICQIQFTY/Nw0roZwULcXpku5i1/m5kt/baz+s4Zogspd839HSMg==", "dev": true, "license": "MIT", "bin": { diff --git a/client/package.json b/client/package.json index e2905fa729..ab4fad96b8 100644 --- a/client/package.json +++ b/client/package.json @@ -133,7 +133,7 @@ "karma-coverage": "~2.2.1", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.2.0", - "prettier": "^3.9.4", + "prettier": "^3.9.5", "ts-dedent": "^2.3.0", "ts-morph": "^28.0.0", "ts-node": "^10.9.2", From f4631e417f0ef1c97d30965bc2509eca52ec751c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 12:37:18 +0200 Subject: [PATCH 53/71] Bump @cantoo/pdf-lib from 2.7.1 to 2.7.2 in /client (#6406) --- client/package-lock.json | 8 ++++---- client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index bebe01a0c3..421ac91c48 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -21,7 +21,7 @@ "@angular/platform-browser-dynamic": "^22.0.6", "@angular/router": "^22.0.6", "@angular/service-worker": "^22.0.6", - "@cantoo/pdf-lib": "^2.7.1", + "@cantoo/pdf-lib": "^2.7.2", "@coreui/angular-chartjs": "~5.7.3", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", @@ -1837,9 +1837,9 @@ } }, "node_modules/@cantoo/pdf-lib": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/@cantoo/pdf-lib/-/pdf-lib-2.7.1.tgz", - "integrity": "sha512-oHVfp0JrHYodyF18dG1r85LStjJJs42LLoiu+elB9qZu9YfYoE66omF5hJ3gEKEXk6PPUUEDpBngeZiHMSnueQ==", + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/@cantoo/pdf-lib/-/pdf-lib-2.7.2.tgz", + "integrity": "sha512-M+NYHU8nk8/XhaggiF7khx4R1GHxBOCKM0YmbKQZDga8BDxLmOC5b9HUEd9bmlIZQayRzz8kE/797MCSPEMhAA==", "license": "MIT", "dependencies": { "@pdf-lib/standard-fonts": "^1.0.0", diff --git a/client/package.json b/client/package.json index ab4fad96b8..145dd8bb4d 100644 --- a/client/package.json +++ b/client/package.json @@ -44,7 +44,7 @@ "@angular/platform-browser-dynamic": "^22.0.6", "@angular/router": "^22.0.6", "@angular/service-worker": "^22.0.6", - "@cantoo/pdf-lib": "^2.7.1", + "@cantoo/pdf-lib": "^2.7.2", "@coreui/angular-chartjs": "~5.7.3", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", From 0d89293b48e56a7b18e38039f9c85da2a471172b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 10:44:03 +0000 Subject: [PATCH 54/71] Bump eslint from 9.39.4 to 9.39.5 in /client (#6403) --- client/package-lock.json | 38 +++++++++++++++++++------------------- client/package.json | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 421ac91c48..47727f3164 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -96,7 +96,7 @@ "@typescript-eslint/parser": "^8.64.0", "@vendure/ngx-translate-extract": "^10.2.0", "angular-eslint": "^22.1.0", - "eslint": "^9.39.4", + "eslint": "^9.39.5", "eslint-config-prettier": "^10.1.8", "eslint-plugin-prettier": "^5.5.6", "eslint-plugin-simple-import-sort": "^13.0.0", @@ -2484,9 +2484,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.5.tgz", - "integrity": "sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.6.tgz", + "integrity": "sha512-l2Ul9PrHsPCKcEY/ac7VgFj9D80C7S68sOKc618SyHDPK36s1XcFebXY0iTzUVn4Yq+YbwvSnDmCz9yxjX+QrA==", "dev": true, "license": "MIT", "dependencies": { @@ -2496,7 +2496,7 @@ "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", - "js-yaml": "^4.1.1", + "js-yaml": "^4.3.0", "minimatch": "^3.1.5", "strip-json-comments": "^3.1.1" }, @@ -2508,9 +2508,9 @@ } }, "node_modules/@eslint/eslintrc/node_modules/ajv": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", - "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz", + "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==", "dev": true, "license": "MIT", "dependencies": { @@ -2525,9 +2525,9 @@ } }, "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz", - "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -2589,9 +2589,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.39.4", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz", - "integrity": "sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==", + "version": "9.39.5", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.5.tgz", + "integrity": "sha512-QywQuszQh77pIXCsq998c8hbhSTI/azTty1Z6N53dmAudKHhy573j3yvRLsX2BSp8YpLtoCEG8E9DJe+8zUh4A==", "dev": true, "license": "MIT", "engines": { @@ -8378,9 +8378,9 @@ } }, "node_modules/eslint": { - "version": "9.39.4", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.4.tgz", - "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==", + "version": "9.39.5", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.5.tgz", + "integrity": "sha512-DgZS62aPLXKlnxILS/AYCoRvHaZeXceIzlXPkkGGzJWSow1aEk0lbTlxUSlyjC8jcaKxAdOnTDz+o1JFSBsyjw==", "dev": true, "license": "MIT", "dependencies": { @@ -8389,8 +8389,8 @@ "@eslint/config-array": "^0.21.2", "@eslint/config-helpers": "^0.4.2", "@eslint/core": "^0.17.0", - "@eslint/eslintrc": "^3.3.5", - "@eslint/js": "9.39.4", + "@eslint/eslintrc": "^3.3.6", + "@eslint/js": "9.39.5", "@eslint/plugin-kit": "^0.4.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", diff --git a/client/package.json b/client/package.json index 145dd8bb4d..a3ee6e44c8 100644 --- a/client/package.json +++ b/client/package.json @@ -119,7 +119,7 @@ "@typescript-eslint/parser": "^8.64.0", "@vendure/ngx-translate-extract": "^10.2.0", "angular-eslint": "^22.1.0", - "eslint": "^9.39.4", + "eslint": "^9.39.5", "eslint-config-prettier": "^10.1.8", "eslint-plugin-prettier": "^5.5.6", "eslint-plugin-simple-import-sort": "^13.0.0", From 901b9b103923d0143789fe0cddf198bd3b320c45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 10:54:29 +0000 Subject: [PATCH 55/71] Bump the tiptap group in /client with 14 updates (#6402) --- client/package-lock.json | 384 ++++++++++++++++++++------------------- client/package.json | 19 +- 2 files changed, 203 insertions(+), 200 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 47727f3164..3b39f0882c 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -31,20 +31,21 @@ "@ngx-translate/core": "^17.0.0", "@ngx-translate/http-loader": "^17.0.0", "@openslides/motion-diff": "file:../packages/openslides-motion-diff", - "@tiptap/core": "^3.27.3", - "@tiptap/extension-color": "^3.27.3", - "@tiptap/extension-highlight": "^3.27.3", - "@tiptap/extension-image": "^3.27.3", + "@tiptap/core": "^3.27.4", + "@tiptap/extension-blockquote": "^3.27.4", + "@tiptap/extension-color": "^3.27.4", + "@tiptap/extension-highlight": "^3.27.4", + "@tiptap/extension-image": "^3.27.4", "@tiptap/extension-link": "^3.23.4", "@tiptap/extension-list": "^3.22.4", - "@tiptap/extension-subscript": "^3.27.3", - "@tiptap/extension-superscript": "^3.27.3", - "@tiptap/extension-table": "^3.27.3", - "@tiptap/extension-text-align": "^3.27.3", + "@tiptap/extension-subscript": "^3.27.4", + "@tiptap/extension-superscript": "^3.27.4", + "@tiptap/extension-table": "^3.27.4", + "@tiptap/extension-text-align": "^3.27.4", "@tiptap/extension-text-style": "^3.4.2", "@tiptap/extensions": "^3.22.4", "@tiptap/pm": "^3.27.3", - "@tiptap/starter-kit": "^3.27.3", + "@tiptap/starter-kit": "^3.27.4", "@tsparticles/angular": "^3.0.0", "@tsparticles/engine": "^3.9.1", "@tsparticles/plugin-emitters": "^3.9.1", @@ -5042,219 +5043,192 @@ } }, "node_modules/@tiptap/core": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.27.3.tgz", - "integrity": "sha512-TJj5929M96C1KlH796wS8MywfHDh49RhmakOyzyMMc9pFmRj9UXi1gj0TCXgsZtjEOG7B+m/DRvNOvnuvR9kmg==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.27.4.tgz", + "integrity": "sha512-8W/GwlEn0JwNdpyVfTWcXwHYUpj9BWwO++YxtizmgjJzlwigSh7/xLVJMwVykuQHQ2fCq5rkUvmBRtpHOMLUQA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/pm": "3.27.3" + "@tiptap/pm": "3.27.4" } }, "node_modules/@tiptap/extension-blockquote": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.27.3.tgz", - "integrity": "sha512-VGoVMcqcGkkoduzEqQ70ZK5OOHBDn5iYeHJSgkvNoSHzYHl0CaKoWxoDKJjSWC5DAM4mBU+tXTlsiUp3evRMfA==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.27.4.tgz", + "integrity": "sha512-d1tOHgP3R5cOE+Ot8qL/dkLXRByajgn+j6cCXHqDtmJO2wsK9knmbKQ0SEjbKrU6OgHrTnY/EotNxBEBW9HGoA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4", + "@tiptap/pm": "3.27.4" } }, "node_modules/@tiptap/extension-bold": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.27.3.tgz", - "integrity": "sha512-pchbycFppBqBmvk+OxrQLIPZLNd3rNbcm7zOa+OTjluphpAcsJ6AmHBmiRhJUYWitV6/SA+0nujcaWxBp5hNcQ==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.27.4.tgz", + "integrity": "sha512-wTtJUUAxCAZ01ICH2DNlOBzzHKRQ1ZST8aRYtIhBPzqEUhnJaKGcjnDB4X49fqPi48iXaPxzhsInDl+rVUujWg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-bullet-list": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.27.3.tgz", - "integrity": "sha512-owQW6mcgnYgQU1z5BqmslcjZFBUm1SGM/Ax++4R6XelIt/7ol6uSTjzjAzum+ASW7UlBbuJHuSgRjl8cA+RGkg==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.27.4.tgz", + "integrity": "sha512-rvja0N1RnwGJAVwDdbUfDIJ4NoT+KjPFaZudKiPuEMfMHfbqe4xcbbC2hsfs61JNcl2xmx+ohV6lzD9YxxJl1w==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.3" + "@tiptap/extension-list": "3.27.4" } }, "node_modules/@tiptap/extension-code": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.27.3.tgz", - "integrity": "sha512-T7JF10Y3k7fyVujXXLVubdUh7fctgBUoiuxbvjotpltg1U/mPbOcT0UW/uif9j3H8TFvAwNApVw3x8bwwFUakA==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.27.4.tgz", + "integrity": "sha512-aPc7opCR1ylK4m4c2lsjLsGpEBD1fLQQKWd5PbZiJvrTF8gkdGZlYLt9A6VukpxeJyHhb22Jaj4fxgKmGMeTtw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" - } - }, - "node_modules/@tiptap/extension-code-block": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.27.3.tgz", - "integrity": "sha512-3CVnzkpGoqqI5KaXI9l9PMwLkx34SYY63tpeo0I0QjDk4LU+JTAQDTPJFSwB4zTsHZ7ZFMU0jjasFOZ1kZRVgw==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "3.27.3", - "@tiptap/pm": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-color": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-color/-/extension-color-3.27.3.tgz", - "integrity": "sha512-tNXyK3VXPGygJP+vq1+YyPmrxLabx4vs+rYiVhGtmhIapTQeMVYcHbFH4s4v3h5m8JGVlTWnpI8n7cb5ExIhSQ==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-color/-/extension-color-3.27.4.tgz", + "integrity": "sha512-uGbgErKGKO4OTBGqnXOA1CGXa3IqoBaiPBGcHu/px01fS8EVFu0A7q5HS6vxFiMK6qW5x71sEpCA+FUINMAb3g==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-text-style": "3.27.3" + "@tiptap/extension-text-style": "3.27.4" } }, "node_modules/@tiptap/extension-document": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.27.3.tgz", - "integrity": "sha512-PR25MRv56Nm4ETVLwA8nAh/0RrVdvD4D2nxnAC8kUkxz1WOYDaqTfPqqEeSWDoUUTUp1I1xzDkD4x0gEnAlmZA==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.27.4.tgz", + "integrity": "sha512-7nAqgfkgb9HADBeCTnOHuTiyZuxfxvMPT3nH4OZeY+cmtkI1On3QffqlmtcUPvNbkhT3o9ehA1hVfCnQ1Ye4LQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-dropcursor": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.27.3.tgz", - "integrity": "sha512-XsL0Ziual+ynXyx5JgLb0KIOShlMN3MW7+GQvf9PGRb1vOB7IOTRFDxMPrxDWcFIZ6WWMWSrbkCLOKHStt1BWg==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.27.4.tgz", + "integrity": "sha512-RiZasQJuUTUO3aME16Bn8eJH7cYnvhT5JCFDFq0ya/1iFI9wUQA2NJC5tb5TrZ74+sQwkYU9VzexnchM481Y9w==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "3.27.3" + "@tiptap/extensions": "3.27.4" } }, "node_modules/@tiptap/extension-gapcursor": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.27.3.tgz", - "integrity": "sha512-MVBqzwYrDOttkn2GOrvvKTDCymfSS2VGSKpahcKKhge5mweSDiqko2X1vBDnMF8aVW3WxIFfDMmO4VMmh8HDZA==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.27.4.tgz", + "integrity": "sha512-svLwSKcFhzpcJeXvxxKkRFuQpykmXrQefVhEsaXq0L95yJIIAGKMRmQC3mxKdzL2j0P9cY7V41bNVSyOAyvclw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "3.27.3" + "@tiptap/extensions": "3.27.4" } }, "node_modules/@tiptap/extension-hard-break": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.27.3.tgz", - "integrity": "sha512-cySObJITR2CRrWII87mI2LJ12wEETTnxt2p1vvC6ZtUmKnB50fOu+ux8ZEt6KYNocIOtrEZthNFzTOx7R7UtrQ==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.27.4.tgz", + "integrity": "sha512-W+Z9pmDgqjbdu3NeZOQrzA15iM4w60Yd8l2CYzxcdApPVIfYzb2S3a7+u1RqW9wnTYb6xyZjASmFNfxXS4P4cg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-heading": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.27.3.tgz", - "integrity": "sha512-QHXnsNic6iId8pnsFZ8z4PkX5L+HCHa/D7rAi3nNWtPlSIAOxo4nKrALcB5/tHmY+XL8kEXKH3nsNLNEDLCYPg==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.27.4.tgz", + "integrity": "sha512-RgvpxzuYk6QEK+az+eiXpWvGlUso42zNcGnjyUrvskoZjS47MbhSg8ylRYQSRtXE0ETlXhAx4J7iGlGr72kyIw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-highlight": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-highlight/-/extension-highlight-3.27.3.tgz", - "integrity": "sha512-99QYxMx8F/NhdvznM8/Zhm4XiCdMU0OEiLwPvLNObJiKV8UBqjdA68cJLX6FRuOi2nqD7xfJq2KuSsFKBldi2A==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "3.27.3" - } - }, - "node_modules/@tiptap/extension-horizontal-rule": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.27.3.tgz", - "integrity": "sha512-sNCuo0+Q001B5XTVWY+ULpWXQqtBNRmAqXxAexZl44bx3rDqHG8OzjwT4EM0LIj2+BYVbdqwaJ1vfQbZVEEbig==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-highlight/-/extension-highlight-3.27.4.tgz", + "integrity": "sha512-STRX1qJLhTZslBF8fEE5qpTGrFd/g7Ufidjxt84p0uT8FrtcbfPUwyweeYwhZp7Iw8n+qODGYnheJTOpfaW2JA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3", - "@tiptap/pm": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-image": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.27.3.tgz", - "integrity": "sha512-3OVLRH54Xkh9yrI5oGIempuqZkhLG1plyJBRnapx0N8j9IjEImOLF78kPYoAZzaBuU78M3Zk/E7HQZgmnaNRBg==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.27.4.tgz", + "integrity": "sha512-yQ8CazyOL4z1/NbV1NLGv6DvchVhOXHH3uQ7md5VX/IGZruFpnm8IpF9MDpdAUxUFmTsXJDYyO2lWGO1PYWG8A==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-italic": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.27.3.tgz", - "integrity": "sha512-7VpVi2vn8kGFAc/HLrt96J/E6+LXOGKn8xLhJS863t150yLIG3EPQLA1h+G5O6eo+/w+9YokvJAAJoeDihj1Jg==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.27.4.tgz", + "integrity": "sha512-PeZT4XbyxAp7Lqo/hfA1k5LI27g1RlgS+YgXp2CeHXIrUfSpO5HlZXh02Bvb0pOdl3RFw2tEKtlHzjt8Y1+Nwg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-link": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.27.3.tgz", - "integrity": "sha512-iXmu1tJ/3vP60c9d+zfO3+X64vod2EyBrM1qeufecAtWA6t0bT9tYeka0Zq6qDRGsZK5zViO9F2lsY7eHXiYuA==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.27.4.tgz", + "integrity": "sha512-6K/FkNwMLWWQbNWKlycrUPTN7YcyVFdFwZncoBXe5WyarRjLTGw7ywafnCI9PDIWSq7ttzVL4NgjN2IN8kBXww==", "license": "MIT", "dependencies": { "linkifyjs": "^4.3.3" @@ -5264,201 +5238,201 @@ "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3", - "@tiptap/pm": "3.27.3" + "@tiptap/core": "3.27.4", + "@tiptap/pm": "3.27.4" } }, "node_modules/@tiptap/extension-list": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.27.3.tgz", - "integrity": "sha512-52rcaSzYjtVGUrNkdB8k1Bw/rId2lBirrWMvmnBLsieoeFd8zo8ow5zkwV057BYSgWXfnMAV7GOpDyq2IoSD9A==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.27.4.tgz", + "integrity": "sha512-A0BgmRO1RE0yLCx9w7GQITtKfS9wLE5cdngSYDiSpwulcXJhJjKm5mZ4OUZmks2VN4HO5jMl2BWCGt2NSDhA+w==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3", - "@tiptap/pm": "3.27.3" + "@tiptap/core": "3.27.4", + "@tiptap/pm": "3.27.4" } }, "node_modules/@tiptap/extension-list-item": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.27.3.tgz", - "integrity": "sha512-UddhVaQ7+V9IfQVVE8AJLNzSmyaaNpZPQsoPQxFNlJyOFxD6RwSTT8L4rb/TwbUctxSFWpyd1J7exzf33Ony/g==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.27.4.tgz", + "integrity": "sha512-z5TVuPw2mkK0B/x+gFg3uUV7tBdaElDFg0zVgnXZCqlSVTLfIyInOOnG5LTWoAd9BdzBjGrzE3PohDcLVDDGBQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.3" + "@tiptap/extension-list": "3.27.4" } }, "node_modules/@tiptap/extension-list-keymap": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.27.3.tgz", - "integrity": "sha512-GZPVg4QCFm41yTMPEPeTlH2odNeQwRuWHY/pt3pI5LsfipQ4kDBv6h9we928vJQUnU2Gg9Y3cL5iRbmXIWWTUA==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.27.4.tgz", + "integrity": "sha512-on7JNDi7Eqz7UdZeZdiO83bQHo0flVDHzjmtR+v/nrCGW9H15D3CHs5+4ozLDiCvTK8tbkBuut/l9AWNxcCE/Q==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.3" + "@tiptap/extension-list": "3.27.4" } }, "node_modules/@tiptap/extension-ordered-list": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.27.3.tgz", - "integrity": "sha512-oHYoE65WfRSM5tCcXi8MtQmzPxz83E2qw0pa2yHBKwr9xCCQUu8vJHJE+EJGduWdaNImv43+6/6kVMeYYbXRKg==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.27.4.tgz", + "integrity": "sha512-bHwLiof0FqJfWzB0act7oEKMTZatEKQ4IYCvmyF5EktjMs4kxEatkPp4Yx/1LSYSjLy1MMT7oLELyaz2FFYyXA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.3" + "@tiptap/extension-list": "3.27.4" } }, "node_modules/@tiptap/extension-paragraph": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.27.3.tgz", - "integrity": "sha512-G5XPCN7lm0nULYPelJC2eUbKbt1q97j67e/HSWxwMYEXhceec5eNAtVfpDCRyXNO9osyBi2kXqLv/IQtxbch9A==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.27.4.tgz", + "integrity": "sha512-8Dnr1J5s/s4XYYuEF3b784NnCxLjXOlQpmGyXRxTAzW7JaOP08tIUJWVNvSMekfXc2vXa33HUbqjxyyWZEQ6LQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-strike": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.27.3.tgz", - "integrity": "sha512-dp6Rs3I4zLVJPvAw2Q9yrNuYKcX5LTONH3/oyULvGsrqq5DKz7pqscfwhwnDSzrgm/3aCz6B9r1BVHlYI/DXlA==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.27.4.tgz", + "integrity": "sha512-8OXwcPKuV3ToBBgyvDxH1jQdObK5FIKCGiyIim6qNWiOpi9BhM3XYD+aO1khjv8qIjtoI/DYbizF4ewj09fX2g==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-subscript": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-3.27.3.tgz", - "integrity": "sha512-jsnoOWQ40kd7B6NMkdZxsZpcSk/+BevN6TprOVaPbo6cbThjmMCfyL/yCBRTWF/N2KMLMplz1WBhPUEG2Qk3mg==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-3.27.4.tgz", + "integrity": "sha512-gs0AexP7GsE9vgdkwhqYgrKu7kD96PjmgCorsGLdA60m71eTavm6j8NN1m1nvcDPO1sTpP8ACs2mhipj+WS5Iw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3", - "@tiptap/pm": "3.27.3" + "@tiptap/core": "3.27.4", + "@tiptap/pm": "3.27.4" } }, "node_modules/@tiptap/extension-superscript": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-3.27.3.tgz", - "integrity": "sha512-y37F/ckFXvCkGVx0hk1qYr0XBXUuBstbwcy1AbW7xzPh07cn8xeTa21j3ytSMaAuSaaKh/TGIj/+DhbnovK8cw==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-3.27.4.tgz", + "integrity": "sha512-krlpnLeNBF6hVbQDrkuoXiy52v5YctoGPkLnxmftYNtloVrikRpgpetTRsFh0P6hLwv6g/g8SzoM23iMBB3S4A==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3", - "@tiptap/pm": "3.27.3" + "@tiptap/core": "3.27.4", + "@tiptap/pm": "3.27.4" } }, "node_modules/@tiptap/extension-table": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.27.3.tgz", - "integrity": "sha512-P7iQ0SkkDWZwnXzQDOVFLXktXlX67VQ3s2YxoJYKTHlc8rPZ4UCaSogFq0G2APyBlizlY3LbMNrDeZAVFOD8wQ==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.27.4.tgz", + "integrity": "sha512-ejQjqt8GjUn4YswG/SsiLr/W3LZApZGUEDW0N7NoOduE0dBZ/pVJHPuqWu33kK+phJjSNCIN+bSAkoWE01rZSw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3", - "@tiptap/pm": "3.27.3" + "@tiptap/core": "3.27.4", + "@tiptap/pm": "3.27.4" } }, "node_modules/@tiptap/extension-text": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.27.3.tgz", - "integrity": "sha512-wSatZ/bop0pleeC18nF90zvWWEoRe/ewZncvm8LjcMrXwq41kTEs3j7nZflMYAh7X8fZvu00UIMeEyCNJl+5Yg==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.27.4.tgz", + "integrity": "sha512-lKQH/hP4FBXsziHypd6Ywj8JFvMLM5GVkK1xsH6yApNuXbHq95rd42ZOYWpYILIBib7tlaz93z61d74UrJiuiw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-text-align": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.27.3.tgz", - "integrity": "sha512-yyhlwRz0Eh6xQCn+GtTDWUGqxGajT02Qf8zBN/3eZQtl3EZ2xrI8lvfLmcV9SAW0srgMd+5hX0CVV+zKeXuxeg==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.27.4.tgz", + "integrity": "sha512-ArfL7GLOXCSmrmiBiaWwAf7RPHXDdxLGPru29qKDLQDthjXcNOdlwlPBbolRu7mXwlSmaYpqWGrG75/AEat3mw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-text-style": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.27.3.tgz", - "integrity": "sha512-oim4RqFtMBCA4N+J8f8dTFFYZrwyfmXLxLL5SvQkn+kkpfGLv8PqJCnJ4uHxsnHXDNsWHBtVVhfTGUABZsTEHg==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.27.4.tgz", + "integrity": "sha512-Wmj64TQXY85gc7lUNbubW32sDCnVOJlpGraMeARRC9Z0EKBX1JpAxddo/64F17bn3kzLxXVszBFyLRcNgTdU2g==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extension-underline": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.27.3.tgz", - "integrity": "sha512-YH7ka/Rp7ZwlzTuQCcs0OZ4CMSx/P/MzbseQKxKebEIZreWaKMZAaED97Fnu0dA66VlreD4/1C7xHJy84ovamg==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.27.4.tgz", + "integrity": "sha512-nRJGvRyEXDtINlHTW+C2oWcL3vmX1URVxAPpkD3Zwn5Rb/vEeOU/pk/w97I0iid816MR4iVbvl1XhbUVegK9gQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3" + "@tiptap/core": "3.27.4" } }, "node_modules/@tiptap/extensions": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.27.3.tgz", - "integrity": "sha512-IA2QKUVJgzUPEhhkUfr6P5u5GFVfhiApiEaaHXBz07saL2c4HNoVs2RC18QlZDCtLNKrPR1mUScr72u7uYs+YQ==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.27.4.tgz", + "integrity": "sha512-d8opkg2iGtVwJmNGIqv0blfRxnvWOJp1brz+Z8CsP4ojSS2ZtaE46d6JSQ5OeJ7nMpjhT+9wh4UQcA7OSEO59w==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.3", - "@tiptap/pm": "3.27.3" + "@tiptap/core": "3.27.4", + "@tiptap/pm": "3.27.4" } }, "node_modules/@tiptap/pm": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.27.3.tgz", - "integrity": "sha512-ppiG57RxM3HSHHgcHT0hP6Ib4P56Sd5itxdV4w0hIGHKPGyLLKiAkYp+htIHa9T7IvjMdaqxIlsfyV3ZKsS1sw==", + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.27.4.tgz", + "integrity": "sha512-UB8lcyomfWk7YGI2PZKNqcYXfyRA+PFj+QntlsUXyrsiA5JJIaE8SHKYjxKlGG/xtW3EtPm1b0p38T9Mk4xiFw==", "license": "MIT", "dependencies": { "prosemirror-changeset": "^2.4.1", @@ -5481,41 +5455,69 @@ } }, "node_modules/@tiptap/starter-kit": { - "version": "3.27.3", - "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.27.3.tgz", - "integrity": "sha512-xX3baFqiC30skntdhxUUvyJo755ON9c1pE83+2Wiq2g+Qnffg9knUuLCZStHoZZ318yB0aBsKAMvHWLtYDo8AA==", - "license": "MIT", - "dependencies": { - "@tiptap/core": "^3.27.3", - "@tiptap/extension-blockquote": "^3.27.3", - "@tiptap/extension-bold": "^3.27.3", - "@tiptap/extension-bullet-list": "^3.27.3", - "@tiptap/extension-code": "^3.27.3", - "@tiptap/extension-code-block": "^3.27.3", - "@tiptap/extension-document": "^3.27.3", - "@tiptap/extension-dropcursor": "^3.27.3", - "@tiptap/extension-gapcursor": "^3.27.3", - "@tiptap/extension-hard-break": "^3.27.3", - "@tiptap/extension-heading": "^3.27.3", - "@tiptap/extension-horizontal-rule": "^3.27.3", - "@tiptap/extension-italic": "^3.27.3", - "@tiptap/extension-link": "^3.27.3", - "@tiptap/extension-list": "^3.27.3", - "@tiptap/extension-list-item": "^3.27.3", - "@tiptap/extension-list-keymap": "^3.27.3", - "@tiptap/extension-ordered-list": "^3.27.3", - "@tiptap/extension-paragraph": "^3.27.3", - "@tiptap/extension-strike": "^3.27.3", - "@tiptap/extension-text": "^3.27.3", - "@tiptap/extension-underline": "^3.27.3", - "@tiptap/extensions": "^3.27.3", - "@tiptap/pm": "^3.27.3" + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.27.4.tgz", + "integrity": "sha512-/sb6rFxNt5BO4hWpUwvHh+Yh1kNyCQuuz3oDpGef5HUUjSdu9p9rfNiHWIUKBadK8VXuw5es7N+UlZ4hma+gvA==", + "license": "MIT", + "dependencies": { + "@tiptap/core": "^3.27.4", + "@tiptap/extension-blockquote": "^3.27.4", + "@tiptap/extension-bold": "^3.27.4", + "@tiptap/extension-bullet-list": "^3.27.4", + "@tiptap/extension-code": "^3.27.4", + "@tiptap/extension-code-block": "^3.27.4", + "@tiptap/extension-document": "^3.27.4", + "@tiptap/extension-dropcursor": "^3.27.4", + "@tiptap/extension-gapcursor": "^3.27.4", + "@tiptap/extension-hard-break": "^3.27.4", + "@tiptap/extension-heading": "^3.27.4", + "@tiptap/extension-horizontal-rule": "^3.27.4", + "@tiptap/extension-italic": "^3.27.4", + "@tiptap/extension-link": "^3.27.4", + "@tiptap/extension-list": "^3.27.4", + "@tiptap/extension-list-item": "^3.27.4", + "@tiptap/extension-list-keymap": "^3.27.4", + "@tiptap/extension-ordered-list": "^3.27.4", + "@tiptap/extension-paragraph": "^3.27.4", + "@tiptap/extension-strike": "^3.27.4", + "@tiptap/extension-text": "^3.27.4", + "@tiptap/extension-underline": "^3.27.4", + "@tiptap/extensions": "^3.27.4", + "@tiptap/pm": "^3.27.4" }, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" } }, + "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-code-block": { + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.27.4.tgz", + "integrity": "sha512-a5caWfWN6Z6usy48vzJDDOhWoA6+rFFCHGpQM7jXn/7rRzYPcvBzTZUGptjEbltj4YqtrQ2tVwTJcCtbb+mknA==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/ueberdosis" + }, + "peerDependencies": { + "@tiptap/core": "3.27.4", + "@tiptap/pm": "3.27.4" + } + }, + "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-horizontal-rule": { + "version": "3.27.4", + "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.27.4.tgz", + "integrity": "sha512-2eQU/55nE5mhMJHALtLMuBL3dcVJUDVVT7n+uZYMaYE63BtCvC4VS08YLFSR7JZSVJIlgVAmdt5nAw0B+rEPNA==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/ueberdosis" + }, + "peerDependencies": { + "@tiptap/core": "3.27.4", + "@tiptap/pm": "3.27.4" + } + }, "node_modules/@ts-morph/common": { "version": "0.29.0", "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.29.0.tgz", diff --git a/client/package.json b/client/package.json index a3ee6e44c8..32ac1ce0b6 100644 --- a/client/package.json +++ b/client/package.json @@ -54,20 +54,21 @@ "@ngx-translate/core": "^17.0.0", "@ngx-translate/http-loader": "^17.0.0", "@openslides/motion-diff": "file:../packages/openslides-motion-diff", - "@tiptap/core": "^3.27.3", - "@tiptap/extension-color": "^3.27.3", - "@tiptap/extension-highlight": "^3.27.3", - "@tiptap/extension-image": "^3.27.3", + "@tiptap/core": "^3.27.4", + "@tiptap/extension-blockquote": "^3.27.4", + "@tiptap/extension-color": "^3.27.4", + "@tiptap/extension-highlight": "^3.27.4", + "@tiptap/extension-image": "^3.27.4", "@tiptap/extension-link": "^3.23.4", "@tiptap/extension-list": "^3.22.4", - "@tiptap/extension-subscript": "^3.27.3", - "@tiptap/extension-superscript": "^3.27.3", - "@tiptap/extension-table": "^3.27.3", - "@tiptap/extension-text-align": "^3.27.3", + "@tiptap/extension-subscript": "^3.27.4", + "@tiptap/extension-superscript": "^3.27.4", + "@tiptap/extension-table": "^3.27.4", + "@tiptap/extension-text-align": "^3.27.4", "@tiptap/extension-text-style": "^3.4.2", "@tiptap/extensions": "^3.22.4", "@tiptap/pm": "^3.27.3", - "@tiptap/starter-kit": "^3.27.3", + "@tiptap/starter-kit": "^3.27.4", "@tsparticles/angular": "^3.0.0", "@tsparticles/engine": "^3.9.1", "@tsparticles/plugin-emitters": "^3.9.1", From dfb22bba57ba3e3f07dce6bc9cd5567e8a7affe5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 14:27:00 +0200 Subject: [PATCH 56/71] Bump @coreui/angular-chartjs from 5.7.3 to 5.7.4 in /client (#6405) --- client/package-lock.json | 8 ++++---- client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 3b39f0882c..7dfacb9912 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -22,7 +22,7 @@ "@angular/router": "^22.0.6", "@angular/service-worker": "^22.0.6", "@cantoo/pdf-lib": "^2.7.2", - "@coreui/angular-chartjs": "~5.7.3", + "@coreui/angular-chartjs": "~5.7.4", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", "@intevation/tiptap-extension-office-paste": "^0.1.2", @@ -1863,9 +1863,9 @@ } }, "node_modules/@coreui/angular-chartjs": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/@coreui/angular-chartjs/-/angular-chartjs-5.7.3.tgz", - "integrity": "sha512-2YmX+sPK8JMrpTvoESA4hL5+5jGKWcd6cet+quelz1BOTBOM5EwT00uLXkvTyorvBPma1SJp5eANhwYKF7RhKg==", + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/@coreui/angular-chartjs/-/angular-chartjs-5.7.4.tgz", + "integrity": "sha512-3IMyzCxNE8gdCHbgf1CJ6eRA1ykbiIAEzWFK1KCslGeDFf07HigCzadsycD8q9Lrfddw+iwW0cuEs9p7ybogTw==", "license": "MIT", "dependencies": { "lodash-es": "^4.18.1", diff --git a/client/package.json b/client/package.json index 32ac1ce0b6..80fb6f8f15 100644 --- a/client/package.json +++ b/client/package.json @@ -45,7 +45,7 @@ "@angular/router": "^22.0.6", "@angular/service-worker": "^22.0.6", "@cantoo/pdf-lib": "^2.7.2", - "@coreui/angular-chartjs": "~5.7.3", + "@coreui/angular-chartjs": "~5.7.4", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", "@intevation/tiptap-extension-office-paste": "^0.1.2", From c3aa7ee0f7959b33f0331e0632026d3e15c85fcb Mon Sep 17 00:00:00 2001 From: Loki Elble <69210919+Elblinator@users.noreply.github.com> Date: Fri, 17 Jul 2026 10:20:48 +0200 Subject: [PATCH 57/71] Add tooltips in comment-detail (#6389) --- .../motions/pages/comments/comments.module.ts | 2 ++ .../comment-section-list.component.html | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/comments/comments.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/comments/comments.module.ts index 94b481bb29..e30f1c0d13 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/comments/comments.module.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/comments/comments.module.ts @@ -9,6 +9,7 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; +import { MatTooltipModule } from '@angular/material/tooltip'; import { OpenSlidesTranslationModule } from '@app/site/modules/translations'; import { CommaSeparatedListingComponent } from '@app/ui/modules/comma-separated-listing'; import { HeadBarModule } from '@app/ui/modules/head-bar'; @@ -40,6 +41,7 @@ import { CommentSectionSortComponent } from './components/comment-section-sort/c MatFormFieldModule, MatDialogModule, MatInputModule, + MatTooltipModule, MatCheckboxModule, ReactiveFormsModule ] diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-list/comment-section-list.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-list/comment-section-list.component.html index 58b4667623..087479a5d9 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-list/comment-section-list.component.html +++ b/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-list/comment-section-list.component.html @@ -29,7 +29,11 @@

Comment fields

{{ section.name }}
- + @if (section.read_groups?.length) { Comment fields

- + @if (section.write_groups?.length) { {{ 'Groups with write permissions' | translate }}

} From 6609b288e6d15c0864c14eb1de8283b69e99d8bb Mon Sep 17 00:00:00 2001 From: Ludwig Reiter Date: Mon, 20 Jul 2026 10:33:53 +0200 Subject: [PATCH 58/71] Migrate to Service() and use inject() in the services (#6417) --- .../action-worker-watch.service.ts | 16 +++---- .../app/gateways/actions/action.service.ts | 6 +-- .../src/app/gateways/auth-adapter.service.ts | 6 +-- .../error-mapping/error-map.service.ts | 8 ++-- .../csv-export-for-backend.service.ts | 6 +-- .../csv-export.service/csv-export.service.ts | 6 +-- .../file-export.service.ts | 8 ++-- .../html-to-pdf.service.ts | 6 +-- .../pdf-document.service.ts | 26 +++++----- .../pdf-images.service.ts | 6 +-- .../progress-snack-bar-control.service.ts | 6 +-- .../services/progress-snack-bar.service.ts | 8 ++-- .../xlsx-export.service.ts | 6 +-- .../http-stream-endpoint.service.ts | 8 ++-- client/src/app/gateways/http.service.ts | 6 +-- .../gateways/meeting-media-adapter.service.ts | 6 +-- client/src/app/gateways/notify.service.ts | 6 +-- .../export-meeting-presenter.service.ts | 8 ++-- ...t-active-users-amount-presenter.service.ts | 8 ++-- ...forwarding-committees-presenter.service.ts | 8 ++-- ...t-forwarding-meetings-presenter.service.ts | 8 ++-- .../get-user-editable-presenter.service.ts | 6 +-- ...t-user-related-models-presenter.service.ts | 8 ++-- .../get-user-scope-presenter.service.ts | 8 ++-- .../presenter/get-users-presenter.service.ts | 8 ++-- .../gateways/presenter/get-valid-timezones.ts | 8 ++-- .../gateways/presenter/presenter.service.ts | 8 ++-- .../search-users-presenter.service.ts | 6 +-- .../action-worker-repository.service.ts | 9 ++-- .../agenda/agenda-item-repository.service.ts | 14 +++--- ...assignment-candidate-repository.service.ts | 9 ++-- .../assignment-repository.service.ts | 13 ++--- .../chat-group-repository.service.ts | 9 ++-- .../chat-message-repository.service.ts | 7 +-- .../committee-repository.service.ts | 16 +++---- .../gender/gender-repository.service.ts | 9 ++-- .../groups/group-repository.service.ts | 9 ++-- .../history-entry-repository.service.ts | 9 ++-- .../history-position-repository.service.ts | 10 ++-- .../mediafile-repository.service.ts | 16 +++---- .../meeting-mediafile-repository.service.ts | 14 +++--- .../meeting-repository.service.ts | 16 +++---- .../meeting-user-repository.service.ts | 9 ++-- .../motion-block-repository.service.ts | 13 ++--- .../motion-category-repository.service.ts | 9 ++-- ...hange-recommendation-repository.service.ts | 9 ++-- .../motion-comment-repository.service.ts | 9 ++-- ...tion-comment-section-repository.service.ts | 9 ++-- .../motion-editor-repository.service.ts | 9 ++-- .../motion-repository.service.ts | 15 +++--- .../motion-state-repository.service.ts | 9 ++-- .../motion-submitter-repository.service.ts | 9 ++-- .../motion-supporter-repository.service.ts | 9 ++-- .../motion-workflow-repository.service.ts | 9 ++-- ...orking-group-speaker-repository.service.ts | 9 ++-- .../personal-note-repository.service.ts | 11 ++--- .../organization-repository.service.ts | 9 ++-- ...nt-of-order-category-repository.service.ts | 9 ++-- .../poll-candidate-list-repository.service.ts | 9 ++-- .../poll-candidate-repository.service.ts | 9 ++-- .../option-repository.service.ts | 9 ++-- .../poll-repository.service.ts | 16 +++---- .../vote-repository.service.ts | 16 +++---- .../projection-repository.service.ts | 9 ++-- .../projector-countdown-repository.service.ts | 14 +++--- .../projector-message-repository.service.ts | 9 ++-- .../projector-repository.service.ts | 9 ++-- ...itory-meeting-service-collector.service.ts | 16 +++---- .../repository-service-collector.service.ts | 21 ++++----- .../speakers/speaker-repository.service.ts | 9 ++-- ...vel-list-of-speakers-repository.service.ts | 9 ++-- .../structure-level-repository.service.ts | 9 ++-- .../themes/theme-repository.service.ts | 9 ++-- .../topics/topic-repository.service.ts | 13 ++--- .../users/user-repository.service.ts | 9 ++-- .../src/app/gateways/server-time.service.ts | 9 ++-- client/src/app/gateways/storage.service.ts | 8 ++-- .../utils/import/json-import-file-utils.ts | 6 +-- .../interceptors/auth-token.interceptor.ts | 4 +- .../services/app-load.service.ts | 6 +-- .../services/dom.service.ts | 10 ++-- .../services/shared-worker.service.ts | 6 +-- client/src/app/site/guards/auth.guard.ts | 6 +-- .../src/app/site/guards/permission.guard.ts | 6 +-- .../site/guards/watch-for-changes.guard.ts | 6 +-- .../global-headbar/global-headbar.service.ts | 4 +- .../services/spinner.service.ts | 18 +++---- .../site-wrapper/services/banner.service.ts | 6 +-- .../site-wrapper/services/update.service.ts | 15 +++--- .../services/voting-banner.service.ts | 26 +++++----- .../custom-translation.service.ts | 6 +-- .../services/user-delete-dialog.service.ts | 9 ++-- .../wait-for-action-dialog.service.ts | 16 +++---- .../login/services/browser-support.service.ts | 8 ++-- .../services/point-of-order-dialog.service.ts | 6 +-- .../speaker-user-select-dialog.service.ts | 7 +-- .../moderation-note-pdf.service.ts | 12 ++--- .../agenda-content-object-form.service.ts | 10 ++-- .../services/projectable-list.service.ts | 10 ++-- .../services/projection-dialog.service.ts | 10 ++-- .../poll/base/base-poll-dialog.service.ts | 10 ++-- .../voting-privacy-warning-dialog.service.ts | 6 +-- .../services/entitled-user-filter.service.ts | 9 ++-- .../poll-controller.service.ts | 15 +++--- .../poll-dialog.service.ts | 8 ++-- .../poll-service-mapper.service.ts | 4 +- .../services/poll.service/poll.service.ts | 4 +- .../vote-controller.service.ts | 17 ++++--- .../poll/services/votes-filter.service.ts | 15 +++--- .../services/voting.service/voting.service.ts | 16 +++---- .../services/agenda-forward-dialog.service.ts | 24 +++++----- .../current-list-of-speakers-slide.service.ts | 12 ++--- .../current-list-of-speakers.service.ts | 14 +++--- ...-speaking-structure-level-slide.service.ts | 12 ++--- ...rent-structure-level-list-slide.service.ts | 12 ++--- .../list-of-speakers-controller.service.ts | 17 ++++--- ...nt-of-order-category-controller.service.ts | 15 +++--- .../services/speaker-controller.service.ts | 17 ++++--- .../services/topic-poll-dialog.service.ts | 6 +-- .../topic-poll-pdf.service.ts | 16 +++---- .../topic-poll/services/topic-poll.service.ts | 16 +++---- .../topic-export.service.ts | 12 ++--- .../topic-import.service.ts | 24 ++++------ .../topic-controller.service.ts | 15 +++--- .../topic-pdf.service/topic-pdf.service.ts | 14 +++--- .../agenda-item-export.service.ts | 16 +++---- .../agenda-item-filter.service.ts | 18 ++----- .../agenda-item-multiselect.service.ts | 21 ++++----- .../agenda-item-controller.service.ts | 15 +++--- .../agenda-pdf-catalog-export.service.ts | 24 ++++------ .../assignment-poll-dialog.service.ts | 6 +-- .../assignment-poll-pdf.service.ts | 18 ++++--- .../services/assignment-poll.service.ts | 16 +++---- ...assignment-candidate-controller.service.ts | 13 ++--- .../assignment-filter-list.service.ts | 9 ++-- .../services/assignment-sort-list.service.ts | 6 +-- .../services/assignment-controller.service.ts | 13 ++--- .../services/assignment-export.service.ts | 14 +++--- .../services/assignment-pdf.service.ts | 12 ++--- .../services/chat-group-dialog.service.ts | 6 +-- .../services/chat-group-controller.service.ts | 15 +++--- .../chat-message-controller.service.ts | 15 +++--- .../services/chat-notification.service.ts | 16 +++---- .../pages/chat/services/chat.service.ts | 17 +++---- .../count-users-statistics.service.ts | 12 ++--- .../interaction/services/applause.service.ts | 14 +++--- .../interaction/services/broadcast.service.ts | 6 +-- .../services/call-restriction.service.ts | 20 ++++---- .../services/interaction-receive.service.ts | 14 ++---- .../services/interaction.service.ts | 30 ++++++------ .../operator-media-permission.service.ts | 12 ++--- .../pages/interaction/services/rtc.service.ts | 21 ++++----- .../interaction/services/stream.service.ts | 16 +++---- .../mediafile-list-export.service.ts | 12 ++--- .../mediafile-list-group.service.ts | 6 +-- .../services/mediafile-common.service.ts | 18 ++++--- .../services/mediafile-controller.service.ts | 20 ++++---- .../services/motion-forward-dialog.service.ts | 28 +++++------ .../services/motion-multiselect.service.ts | 47 +++++++++---------- .../motion-category-controller.service.ts | 23 +++++---- .../services/diff-factory.service.ts | 6 +-- .../line-numbering.service.ts | 9 ++-- ...hange-recommendation-controller.service.ts | 17 ++++--- .../motion-diff.service.ts | 14 +++--- .../motion-comment-controller.service.ts | 15 +++--- ...tion-comment-section-controller.service.ts | 15 +++--- .../motion-editor-controller.service.ts | 15 +++--- .../motion-block-controller.service.ts | 17 ++++--- .../motion-poll-controller.service.ts | 8 ++-- .../motion-poll-dialog.service.ts | 6 +-- .../motion-poll-pdf.service.ts | 16 +++---- .../motion-poll.service.ts | 16 +++---- .../personal-note-controller.service.ts | 15 +++--- .../motion-state-controller.service.ts | 15 +++--- .../motion-submitter-controller.service.ts | 15 +++--- .../motion-supporter-controller.service.ts | 17 ++++--- .../motion-workflow-controller.service.ts | 15 +++--- ...orking-group-speaker-controller.service.ts | 15 +++--- .../motion-block-create-dialog.service.ts | 6 +-- .../motion-block-edit-dialog.service.ts | 6 +-- ...motion-block-detail-filter-list.service.ts | 14 ++---- .../motion-block-sort.service.ts | 6 +-- ...on-change-recommendation-dialog.service.ts | 8 ++-- .../motion-detail-view.service.ts | 6 +-- .../motion-list-info-dialog.service.ts | 6 +-- .../workflow-export.service.ts | 12 ++--- .../amendment-controller.service.ts | 12 ++--- .../motion-controller.service.ts | 18 ++++--- .../motion-format.service.ts | 18 +++---- .../motion-line-numbering.service.ts | 12 ++--- .../motion-permission.service.ts | 14 +++--- .../amendment-list-pdf.service.ts | 14 ++---- .../motion-csv-export.service.ts | 20 ++++---- .../motion-export.service.ts | 14 ++---- .../motion-html-to-pdf.service.ts | 6 +-- .../motion-pdf-catalog.service.ts | 20 ++++---- .../motion-pdf-export.service.ts | 22 ++++----- .../motion-pdf.service/motion-pdf.service.ts | 32 ++++++------- .../motion-xlsx-export.service.ts | 16 +++---- .../amendment-list-filter.service.ts | 18 +++---- .../amendment-list-sort.service.ts | 6 +-- .../motion-list-filter.service.ts | 9 ++-- .../motion-list-sort.service.ts | 6 +-- .../participant-csv-export.service.ts | 12 ++--- .../participant-pdf-export.service.ts | 14 ++---- .../participant-pdf.service.ts | 17 ++----- .../speaker-csv-export.service.ts | 16 +++---- .../services/group-controller.service.ts | 15 +++--- .../participant-import.service.ts | 18 ++++--- .../participant-list-info-dialog.service.ts | 6 +-- .../participant-list-filter.service.ts | 22 ++++----- .../participant-list-sort.service.ts | 14 +++--- ...participant-speaker-list-filter.service.ts | 10 ++-- .../participant-speaker-list-sort.service.ts | 6 +-- .../structure-level-controller.service.ts | 15 +++--- .../services/structure-level-sort.service.ts | 6 +-- .../participant-controller.service.ts | 31 ++++++------ .../poll-list-filter.service.ts | 14 +++--- .../projector-countdown-dialog.service.ts | 4 +- .../services/projector-edit-dialog.service.ts | 8 ++-- .../projector-message-dialog.service.ts | 6 +-- .../current-speaker-chyron-slide.service.ts | 12 ++--- .../projection-controller.service.ts | 13 ++--- .../projector-countdown-controller.service.ts | 13 ++--- .../projector-message-controller.service.ts | 13 ++--- .../services/projector-controller.service.ts | 17 ++++--- .../services/active-meeting-id.service.ts | 14 +++--- .../services/active-meeting.service.ts | 6 +-- .../meetings/services/active-polls.service.ts | 16 +++---- .../services/archive-status.service.ts | 6 +-- .../meeting-csv-export-for-backend.service.ts | 10 ++-- .../export/meeting-csv-export.service.ts | 10 ++-- .../export/meeting-pdf-export.service.ts | 18 +++---- .../meetings/services/load-font.service.ts | 10 ++-- .../meetings/services/main-menu.service.ts | 8 +--- .../meetings/services/media-manage.service.ts | 18 ++++--- .../meeting-collection-mapper.service.ts | 16 ++++--- ...ing-component-service-collector.service.ts | 6 +-- ...ng-controller-service-collector.service.ts | 18 +++---- .../services/meeting-controller.service.ts | 17 ++++--- .../services/meeting-data-store.service.ts | 12 ++--- .../meeting-settings-definition.service.ts | 6 +-- .../services/meeting-settings.service.ts | 13 ++--- .../sequential-number-mapping.service.ts | 7 +-- .../account-import.service.ts | 16 +++---- .../account-list-search.service.ts | 6 +-- .../account-sort.service.ts | 6 +-- .../services/gender-controller.service.ts | 15 +++--- .../account-export.service.ts | 12 ++--- .../common/account-controller.service.ts | 21 ++++----- .../services/common/account-filter.service.ts | 22 ++++----- .../modules/services/meeting.service.ts | 6 +-- .../committee-import.service.ts | 9 ++-- .../committee-export.service.ts | 12 ++--- .../committee-filter.service.ts | 10 ++-- .../committee-sort.service.ts | 6 +-- .../services/committee-controller.service.ts | 15 +++--- .../services/theme-builder-dialog.service.ts | 6 +-- .../services/theme-controller.service.ts | 17 ++++--- .../services/meeting-export.service.ts | 16 ++----- .../meeting-list-filter.service.ts | 16 +++---- .../meeting-list-sort.service.ts | 6 +-- .../organization-controller.service.ts | 15 +++--- .../services/organization-settings.service.ts | 15 +++--- .../services/organization.service.ts | 16 +++---- .../site/services/active-filters.service.ts | 12 ++--- .../app/site/services/auth-check.service.ts | 24 ++++------ .../app/site/services/auth-token.service.ts | 6 +-- client/src/app/site/services/auth.service.ts | 26 +++++----- .../autoupdate-communication.service.ts | 28 +++++------ .../services/autoupdate/autoupdate.service.ts | 20 ++++---- .../collection-mapper.service.ts | 6 +-- client/src/app/site/services/color.service.ts | 6 +-- .../component-service-collector.service.ts | 18 +++---- .../services/connection-status.service.ts | 10 ++-- .../controller-service-collector.service.ts | 18 +++---- .../data-store-update-manager.service.ts | 11 ++--- .../app/site/services/data-store.service.ts | 12 ++--- .../src/app/site/services/duration.service.ts | 11 +---- .../site/services/fallback-routes.service.ts | 12 ++--- .../global-search/global-search.service.ts | 14 ++---- .../import-service-collector.service.ts | 14 ++---- .../app/site/services/lifecycle.service.ts | 8 ++-- .../model-request-builder.service.ts | 12 ++--- .../site/services/model-request.service.ts | 16 +++---- .../services/openslides-router.service.ts | 30 ++++++------ .../services/openslides-status.service.ts | 6 +-- .../app/site/services/openslides.service.ts | 20 ++++---- .../src/app/site/services/operator.service.ts | 34 +++++++------- .../site/services/relation-manager.service.ts | 14 +++--- .../src/app/site/services/reroute.service.ts | 16 +++---- client/src/app/site/services/theme.service.ts | 22 ++++----- .../app/site/services/time-zone.service.ts | 6 +-- .../site/services/user-controller.service.ts | 19 ++++---- client/src/app/site/services/user.service.ts | 19 +++----- .../view-model-store-update.service.ts | 14 ++---- .../site/services/view-model-store.service.ts | 8 ++-- .../app/site/services/view-port.service.ts | 10 ++-- .../services/window-visibility.service.ts | 8 ++-- .../choice-dialog/services/choice.service.ts | 4 +- .../services/routing-state.service.ts | 6 +-- .../openslides-date-adapter.ts | 4 +- .../services/overlay.service.ts | 4 +- .../prompt-dialog/services/prompt.service.ts | 6 +-- .../scrolling-table-manage.service.ts | 6 +-- .../services/chess-challenge.service.ts | 6 +-- .../easter-egg-content-platform.service.ts | 6 +-- .../services/tree-sort.service.ts | 6 +-- .../sorting-tree/services/tree.service.ts | 6 +-- 309 files changed, 1566 insertions(+), 2205 deletions(-) diff --git a/client/src/app/gateways/action-worker-watch/action-worker-watch.service.ts b/client/src/app/gateways/action-worker-watch/action-worker-watch.service.ts index 869dfdbe04..fb117ba7fb 100644 --- a/client/src/app/gateways/action-worker-watch/action-worker-watch.service.ts +++ b/client/src/app/gateways/action-worker-watch/action-worker-watch.service.ts @@ -1,5 +1,5 @@ import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id, Ids } from '@app/domain/definitions/key-types'; import { ActionWorkerState } from '@app/domain/models/action-worker/action-worker'; import { idFromFqid } from '@app/infrastructure/utils/transform-functions'; @@ -12,9 +12,7 @@ import { ActionWorkerRepositoryService } from '../repositories/action-worker/act import { ViewActionWorker } from '../repositories/action-worker/view-action-worker'; import { ACTION_WORKER_SUBSCRIPTION, getActionWorkerSubscriptionConfig } from './action-worker-watch.subscription'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ActionWorkerWatchService { public get currentWorkerIds(): Id[] { return this._currentWorkerIds; @@ -35,11 +33,11 @@ export class ActionWorkerWatchService { private _confirmationToWaitTimestamps: Record = {}; - public constructor( - private actionWorkerRepo: ActionWorkerRepositoryService, - private modelRequestService: ModelRequestService, - private dialogService: WaitForActionDialogService - ) { + private actionWorkerRepo = inject(ActionWorkerRepositoryService); + private modelRequestService = inject(ModelRequestService); + private dialogService = inject(WaitForActionDialogService); + + public constructor() { this.actionWorkerRepo .getViewModelListObservable() .subscribe(workers => diff --git a/client/src/app/gateways/actions/action.service.ts b/client/src/app/gateways/actions/action.service.ts index af3fc8cc9a..1ac5112a82 100644 --- a/client/src/app/gateways/actions/action.service.ts +++ b/client/src/app/gateways/actions/action.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { HttpService } from '../http.service'; import { Action } from './action'; @@ -10,9 +10,7 @@ const ACTION_SEPARATELY_URL = `/system/action/handle_separately`; let uniqueFnId = 0; -@Injectable({ - providedIn: `root` -}) +@Service() export class ActionService { private readonly _beforeActionFnMap: Record = {}; diff --git a/client/src/app/gateways/auth-adapter.service.ts b/client/src/app/gateways/auth-adapter.service.ts index 022e566932..bab8a3a1fc 100644 --- a/client/src/app/gateways/auth-adapter.service.ts +++ b/client/src/app/gateways/auth-adapter.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { environment } from '../../environments/environment'; import { HttpService } from './http.service'; @@ -9,9 +9,7 @@ interface AuthServiceResponse { token?: string; } -@Injectable({ - providedIn: `root` -}) +@Service() export class AuthAdapterService { private get authUrl(): string { return `/${environment.authUrlPrefix}`; diff --git a/client/src/app/gateways/error-mapping/error-map.service.ts b/client/src/app/gateways/error-mapping/error-map.service.ts index 90f83c2eec..0f4d10fc8f 100644 --- a/client/src/app/gateways/error-mapping/error-map.service.ts +++ b/client/src/app/gateways/error-mapping/error-map.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { DefaultErrorMap, ErrorMap, isMapError, UrlFragmentToHttpErrorMap } from './error-map-utils'; @@ -13,11 +13,9 @@ interface GetHttpErrorMapOptions { data?: any; } -@Injectable({ - providedIn: `root` -}) +@Service() export class ErrorMapService { - public constructor(private translate: TranslateService) {} + private translate = inject(TranslateService); /** * Takes an error message and tries to match it to a cleaner version in the corresponding ErrorMap. diff --git a/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts b/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts index 658d3f454a..c5d9cdcf8c 100644 --- a/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts +++ b/client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { BaseViewModel } from '@app/site/base/base-view-model'; import { FileExportService } from '../file-export.service'; @@ -12,9 +12,7 @@ import { isPropertyDefinition } from './csv-export-utils'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class CsvExportForBackendService { private exporter = inject(FileExportService); diff --git a/client/src/app/gateways/export/csv-export.service/csv-export.service.ts b/client/src/app/gateways/export/csv-export.service/csv-export.service.ts index e99a5d9e1e..8db58471a0 100644 --- a/client/src/app/gateways/export/csv-export.service/csv-export.service.ts +++ b/client/src/app/gateways/export/csv-export.service/csv-export.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { BaseViewModel } from '../../../site/base/base-view-model'; @@ -13,9 +13,7 @@ import { isPropertyDefinition } from './csv-export-utils'; -@Injectable({ - providedIn: `root` -}) +@Service() export class CsvExportService { private exporter = inject(FileExportService); private translate = inject(TranslateService); diff --git a/client/src/app/gateways/export/file-export.service/file-export.service.ts b/client/src/app/gateways/export/file-export.service/file-export.service.ts index 1198f97fda..7ef19b056f 100644 --- a/client/src/app/gateways/export/file-export.service/file-export.service.ts +++ b/client/src/app/gateways/export/file-export.service/file-export.service.ts @@ -1,13 +1,11 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { HttpService } from '@app/gateways/http.service'; import { saveAs } from 'file-saver'; import JSZip from 'jszip'; -@Injectable({ - providedIn: `root` -}) +@Service() export class FileExportService { - public constructor(private http: HttpService) {} + private http = inject(HttpService); /** * Saves a file diff --git a/client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.ts b/client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.ts index 6838eb9480..dd9962c256 100644 --- a/client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.ts +++ b/client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MEETING_PDF_EXPORT_HEADING_STYLES } from '@app/domain/models/meetings/meeting.constants'; import { Content, ContentColumns } from 'pdfmake/interfaces'; @@ -28,9 +28,7 @@ export interface CreateSpecificParagraphPayload { * const dd = htmlToPdfService.convertHtml('

Hello World!

'); * ``` */ -@Injectable({ - providedIn: `root` -}) +@Service() export class HtmlToPdfService { /** * Normal line height for paragraphs diff --git a/client/src/app/gateways/export/pdf-document.service/pdf-document.service.ts b/client/src/app/gateways/export/pdf-document.service/pdf-document.service.ts index ae7ffa76fa..7059a35020 100644 --- a/client/src/app/gateways/export/pdf-document.service/pdf-document.service.ts +++ b/client/src/app/gateways/export/pdf-document.service/pdf-document.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Settings } from '@app/domain/models/meetings/meeting'; import { MOTION_PDF_OPTIONS } from '@app/domain/models/motions/motions.constants'; import { Functionable } from '@app/infrastructure/utils'; @@ -308,9 +308,7 @@ export interface HeaderLogos { * this.pdfDocumentService.download(motionContent, 'test.pdf'); * ``` */ -@Injectable({ - providedIn: `root` -}) +@Service() export class PdfDocumentService { /** * A list of all images to add to the virtual file system. @@ -324,16 +322,16 @@ export class PdfDocumentService { private settings: Partial = {}; - public constructor( - private translate: TranslateService, - private httpService: HttpService, - // private matSnackBar: MatSnackBar, - private progressSnackBarService: ProgressSnackBarService, - private progressService: ProgressSnackBarControlService, - private pdfImagesService: PdfImagesService, - private mediaManageService: MediaManageService, - private meetingSettingsService: MeetingSettingsService - ) { + private translate = inject(TranslateService); + private httpService = inject(HttpService); + // private matSnackBar = inject(MatSnackBar); + private progressSnackBarService = inject(ProgressSnackBarService); + private progressService = inject(ProgressSnackBarControlService); + private pdfImagesService = inject(PdfImagesService); + private mediaManageService = inject(MediaManageService); + private meetingSettingsService = inject(MeetingSettingsService); + + public constructor() { this.makeSettingsSubscriptions(); } diff --git a/client/src/app/gateways/export/pdf-document.service/pdf-images.service.ts b/client/src/app/gateways/export/pdf-document.service/pdf-images.service.ts index 765d214059..2b5e38594f 100644 --- a/client/src/app/gateways/export/pdf-document.service/pdf-images.service.ts +++ b/client/src/app/gateways/export/pdf-document.service/pdf-images.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; const IMAGE_USABLE_FOR_PDF_MIMETYPES = [`image/png`, `image/jpeg`]; @@ -6,9 +6,7 @@ const IMAGE_USABLE_FOR_PDF_MIMETYPES = [`image/png`, `image/jpeg`]; * This is a helper service that caches the URLs of the images in the attachment * so that they can be loaded into the virtual file system before PDF creation. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class PdfImagesService { private imageUrls: string[] = []; diff --git a/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar-control.service.ts b/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar-control.service.ts index 894d479123..453c3092d9 100644 --- a/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar-control.service.ts +++ b/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar-control.service.ts @@ -1,10 +1,8 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { ProgressBarMode } from '@angular/material/progress-bar'; import { Subject } from 'rxjs'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ProgressSnackBarControlService { /** * Subject to get text to display diff --git a/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar.service.ts b/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar.service.ts index 61ac0f157c..4086ee2c54 100644 --- a/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar.service.ts +++ b/client/src/app/gateways/export/progress-snack-bar/services/progress-snack-bar.service.ts @@ -1,13 +1,11 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatSnackBar, MatSnackBarConfig, MatSnackBarRef } from '@angular/material/snack-bar'; import { ProgressSnackBarComponent } from '../components/progress-snack-bar/progress-snack-bar.component'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ProgressSnackBarService { - public constructor(private matSnackBar: MatSnackBar) {} + private matSnackBar = inject(MatSnackBar); public async open(config?: MatSnackBarConfig): Promise> { const module = await import(`../progress-snack-bar.module`).then(m => m.ProgressSnackBarModule); diff --git a/client/src/app/gateways/export/xlsx-export.service/xlsx-export.service.ts b/client/src/app/gateways/export/xlsx-export.service/xlsx-export.service.ts index 578208ea5b..c7651fb2dc 100644 --- a/client/src/app/gateways/export/xlsx-export.service/xlsx-export.service.ts +++ b/client/src/app/gateways/export/xlsx-export.service/xlsx-export.service.ts @@ -1,10 +1,8 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { Workbook, Worksheet } from 'exceljs'; import { saveAs } from 'file-saver'; -@Injectable({ - providedIn: `root` -}) +@Service() export class XlsxExportService { /** * Correction factor for cell width alignment diff --git a/client/src/app/gateways/http-stream/http-stream-endpoint.service.ts b/client/src/app/gateways/http-stream/http-stream-endpoint.service.ts index d4ea39fdb2..d9e4354175 100644 --- a/client/src/app/gateways/http-stream/http-stream-endpoint.service.ts +++ b/client/src/app/gateways/http-stream/http-stream-endpoint.service.ts @@ -1,16 +1,14 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { HttpMethod } from '../../infrastructure/definitions/http'; import { HttpService } from '../http.service'; import { EndpointConfiguration } from './endpoint-configuration'; -@Injectable({ - providedIn: `root` -}) +@Service() export class HttpStreamEndpointService { private endpointConfigurations: Record = {}; - public constructor(private http: HttpService) {} + private http = inject(HttpService); public registerEndpoint(name: string, configuration: EndpointConfiguration): void; public registerEndpoint(name: string, url: string, healthUrl: string, method: HttpMethod): void; diff --git a/client/src/app/gateways/http.service.ts b/client/src/app/gateways/http.service.ts index a41f61b956..6daa5e4c4c 100644 --- a/client/src/app/gateways/http.service.ts +++ b/client/src/app/gateways/http.service.ts @@ -1,5 +1,5 @@ import { HttpClient, HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http'; -import { inject, Injectable, Injector } from '@angular/core'; +import { inject, Injector, Service } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom, Observable } from 'rxjs'; @@ -27,9 +27,7 @@ export interface RequestSettings { catchError?: boolean; } -@Injectable({ - providedIn: `root` -}) +@Service() export class HttpService { private _actionWorkerWatch: ActionWorkerWatchService; private get actionWorkerWatch(): ActionWorkerWatchService { diff --git a/client/src/app/gateways/meeting-media-adapter.service.ts b/client/src/app/gateways/meeting-media-adapter.service.ts index 296e6905a6..bf52ce6dfc 100644 --- a/client/src/app/gateways/meeting-media-adapter.service.ts +++ b/client/src/app/gateways/meeting-media-adapter.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '../domain/definitions/key-types'; import { ViewMediafile } from '../site/pages/meetings/pages/mediafiles'; @@ -9,9 +9,7 @@ type MediaAdapterActionParameters = ({ action: `set`; mediafile: ViewMediafile } place: string; }; -@Injectable({ - providedIn: `root` -}) +@Service() export class MeetingMediaAdapterService { private actionService = inject(ActionService); diff --git a/client/src/app/gateways/notify.service.ts b/client/src/app/gateways/notify.service.ts index 980beb1065..9ae1c1dd64 100644 --- a/client/src/app/gateways/notify.service.ts +++ b/client/src/app/gateways/notify.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { Observable, Subject } from 'rxjs'; import { BaseICCGatewayService } from './base-icc-gateway.service'; @@ -82,9 +82,7 @@ interface NotifySendOptions { channels?: string[]; } -@Injectable({ - providedIn: `root` -}) +@Service() export class NotifyService extends BaseICCGatewayService> { protected readonly serviceDescription = `NotifyService`; diff --git a/client/src/app/gateways/presenter/export-meeting-presenter.service.ts b/client/src/app/gateways/presenter/export-meeting-presenter.service.ts index 5a3abbad1b..ed3f1627f1 100644 --- a/client/src/app/gateways/presenter/export-meeting-presenter.service.ts +++ b/client/src/app/gateways/presenter/export-meeting-presenter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Presenter } from './presenter'; @@ -14,11 +14,9 @@ interface JsonBlob { type JsonBlobValueType = JsonBlob | string | number | boolean; -@Injectable({ - providedIn: `root` -}) +@Service() export class ExportMeetingPresenterService { - public constructor(private presenter: PresenterService) {} + private presenter = inject(PresenterService); public async call(payload: ExportMeetingPresenterPayload): Promise { return await this.presenter.call(Presenter.EXPORT_MEETING, payload); diff --git a/client/src/app/gateways/presenter/get-active-users-amount-presenter.service.ts b/client/src/app/gateways/presenter/get-active-users-amount-presenter.service.ts index 2987db1cee..933de268bc 100644 --- a/client/src/app/gateways/presenter/get-active-users-amount-presenter.service.ts +++ b/client/src/app/gateways/presenter/get-active-users-amount-presenter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Presenter } from './presenter'; import { PresenterService } from './presenter.service'; @@ -7,11 +7,9 @@ interface GetActiveUsersPresenterResult { active_users_amount: number; } -@Injectable({ - providedIn: `root` -}) +@Service() export class GetActiveUsersAmountPresenterService { - public constructor(private presenter: PresenterService) {} + private presenter = inject(PresenterService); public async call(): Promise { const response = await this.presenter.call(Presenter.GET_ACTIVE_USER_AMOUNT, {}); diff --git a/client/src/app/gateways/presenter/get-forwarding-committees-presenter.service.ts b/client/src/app/gateways/presenter/get-forwarding-committees-presenter.service.ts index 33750d748a..9e37c49f7e 100644 --- a/client/src/app/gateways/presenter/get-forwarding-committees-presenter.service.ts +++ b/client/src/app/gateways/presenter/get-forwarding-committees-presenter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Presenter } from './presenter'; @@ -10,11 +10,9 @@ interface GetForwardCommitteesPresenterPayload { type GetForwardingCommitteesPresenterResult = string[]; -@Injectable({ - providedIn: `root` -}) +@Service() export class GetForwardingCommitteesPresenterService { - public constructor(private presenter: PresenterService) {} + private presenter = inject(PresenterService); public async call(payload: GetForwardCommitteesPresenterPayload): Promise { return await this.presenter.call( diff --git a/client/src/app/gateways/presenter/get-forwarding-meetings-presenter.service.ts b/client/src/app/gateways/presenter/get-forwarding-meetings-presenter.service.ts index 1e26be5de7..bcce42bc8c 100644 --- a/client/src/app/gateways/presenter/get-forwarding-meetings-presenter.service.ts +++ b/client/src/app/gateways/presenter/get-forwarding-meetings-presenter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Presenter } from './presenter'; @@ -24,11 +24,9 @@ export interface GetForwardingMeetingsPresenter { type GetForwardingMeetingsPresenterResult = GetForwardingMeetingsPresenter[]; -@Injectable({ - providedIn: `root` -}) +@Service() export class GetForwardingMeetingsPresenterService { - public constructor(private presenter: PresenterService) {} + private presenter = inject(PresenterService); public async call(payload: GetForwardMeetingsPresenterPayload): Promise { return await this.presenter.call( diff --git a/client/src/app/gateways/presenter/get-user-editable-presenter.service.ts b/client/src/app/gateways/presenter/get-user-editable-presenter.service.ts index 356aac93fc..ab046a7f3f 100644 --- a/client/src/app/gateways/presenter/get-user-editable-presenter.service.ts +++ b/client/src/app/gateways/presenter/get-user-editable-presenter.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Presenter } from './presenter'; @@ -13,9 +13,7 @@ type GetUserEditableIdentifiedScope = Record; export type GetUserEditablePresenterResult = Record; -@Injectable({ - providedIn: `root` -}) +@Service() export class GetUserEditablePresenterService { private presenter = inject(PresenterService); diff --git a/client/src/app/gateways/presenter/get-user-related-models-presenter.service.ts b/client/src/app/gateways/presenter/get-user-related-models-presenter.service.ts index fb94e2ed2a..0fda09354c 100644 --- a/client/src/app/gateways/presenter/get-user-related-models-presenter.service.ts +++ b/client/src/app/gateways/presenter/get-user-related-models-presenter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '../../domain/definitions/key-types'; import { CML, OML } from '../../domain/definitions/organization-permission'; @@ -28,11 +28,9 @@ export interface GetUserRelatedModelsCommittee { export type GetUserRelatedModelsPresenterResult = Record; -@Injectable({ - providedIn: `root` -}) +@Service() export class GetUserRelatedModelsPresenterService { - public constructor(private presenter: PresenterService) {} + private presenter = inject(PresenterService); public async call(data: { user_ids: Id[] }): Promise { return await this.presenter.call(Presenter.GET_USER_RELATED_MODELS, data); diff --git a/client/src/app/gateways/presenter/get-user-scope-presenter.service.ts b/client/src/app/gateways/presenter/get-user-scope-presenter.service.ts index a98dc1b691..99dadd0050 100644 --- a/client/src/app/gateways/presenter/get-user-scope-presenter.service.ts +++ b/client/src/app/gateways/presenter/get-user-scope-presenter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { OML } from '@app/domain/definitions/organization-permission'; import { UserScope } from '@app/site/services/user.service'; @@ -21,11 +21,9 @@ interface GetUserScopeIdentifiedScope { export type GetUserScopePresenterResult = Record; -@Injectable({ - providedIn: `root` -}) +@Service() export class GetUserScopePresenterService { - public constructor(private presenter: PresenterService) {} + private presenter = inject(PresenterService); public async call(payload: GetUserScopePresenterPayload): Promise { return await this.presenter.call(Presenter.GET_USER_SCOPE, payload); diff --git a/client/src/app/gateways/presenter/get-users-presenter.service.ts b/client/src/app/gateways/presenter/get-users-presenter.service.ts index f78cc938d3..6c3211af8f 100644 --- a/client/src/app/gateways/presenter/get-users-presenter.service.ts +++ b/client/src/app/gateways/presenter/get-users-presenter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '../../domain/definitions/key-types'; import { Presenter } from './presenter'; @@ -16,11 +16,9 @@ interface GetUsersPresenterPayload { entries?: number; } -@Injectable({ - providedIn: `root` -}) +@Service() export class GetUsersPresenterService { - public constructor(private presenter: PresenterService) {} + private presenter = inject(PresenterService); public async call({ start_index = 0, entries = 1000 }: GetUsersPresenterPayload): Promise { const response = await this.presenter.call(Presenter.GET_USERS, { diff --git a/client/src/app/gateways/presenter/get-valid-timezones.ts b/client/src/app/gateways/presenter/get-valid-timezones.ts index 68699b4467..1ebcb9fa6e 100644 --- a/client/src/app/gateways/presenter/get-valid-timezones.ts +++ b/client/src/app/gateways/presenter/get-valid-timezones.ts @@ -1,15 +1,13 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Presenter } from './presenter'; import { PresenterService } from './presenter.service'; type ValidTimeZones = Record; -@Injectable({ - providedIn: `root` -}) +@Service() export class GetValidTimezonesPresenterService { - public constructor(private presenter: PresenterService) {} + private presenter = inject(PresenterService); public async call(): Promise { const response = await this.presenter.call(Presenter.GET_VALID_TIMEZONES, {}); diff --git a/client/src/app/gateways/presenter/presenter.service.ts b/client/src/app/gateways/presenter/presenter.service.ts index d9649b41f0..bae3f2e4c7 100644 --- a/client/src/app/gateways/presenter/presenter.service.ts +++ b/client/src/app/gateways/presenter/presenter.service.ts @@ -1,15 +1,13 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { HttpService } from '../http.service'; import { Presenter } from './presenter'; const PRESENTER_URL = `/system/presenter/handle_request`; -@Injectable({ - providedIn: `root` -}) +@Service() export class PresenterService { - public constructor(private readonly http: HttpService) {} + private readonly http = inject(HttpService); public async call(presenter: Presenter, data?: D): Promise { const result = await this.http.post(PRESENTER_URL, [{ presenter, data }]); diff --git a/client/src/app/gateways/presenter/search-users-presenter.service.ts b/client/src/app/gateways/presenter/search-users-presenter.service.ts index 1284b34580..243e4d5037 100644 --- a/client/src/app/gateways/presenter/search-users-presenter.service.ts +++ b/client/src/app/gateways/presenter/search-users-presenter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { User } from '@app/domain/models/users/user'; import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; @@ -23,9 +23,9 @@ interface PresenterData { type PresenterResult = Partial[][]; -@Injectable({ providedIn: `root` }) +@Service() export class SearchUsersPresenterService { - public constructor(private presenter: PresenterService) {} + private presenter = inject(PresenterService); public async call( { diff --git a/client/src/app/gateways/repositories/action-worker/action-worker-repository.service.ts b/client/src/app/gateways/repositories/action-worker/action-worker-repository.service.ts index e10bd59cfe..e95e0d37a3 100644 --- a/client/src/app/gateways/repositories/action-worker/action-worker-repository.service.ts +++ b/client/src/app/gateways/repositories/action-worker/action-worker-repository.service.ts @@ -1,15 +1,14 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ActionWorker } from '@app/domain/models/action-worker/action-worker'; import { BaseRepository } from '../base-repository'; import { RepositoryServiceCollectorService } from '../repository-service-collector.service'; import { ViewActionWorker } from './view-action-worker'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ActionWorkerRepositoryService extends BaseRepository { - public constructor(repositoryServiceCollector: RepositoryServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryServiceCollectorService); super(repositoryServiceCollector, ActionWorker); } diff --git a/client/src/app/gateways/repositories/agenda/agenda-item-repository.service.ts b/client/src/app/gateways/repositories/agenda/agenda-item-repository.service.ts index 9a93fa56d3..b2701f10d7 100644 --- a/client/src/app/gateways/repositories/agenda/agenda-item-repository.service.ts +++ b/client/src/app/gateways/repositories/agenda/agenda-item-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id, Ids } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { AgendaItem, AgendaItemType } from '@app/domain/models/agenda/agenda-item'; @@ -12,14 +12,12 @@ import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; import { AgendaItemAction } from './agenda-item.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class AgendaItemRepositoryService extends BaseMeetingRelatedRepository { - public constructor( - repositoryServiceCollector: RepositoryMeetingServiceCollectorService, - private treeService: TreeService - ) { + private treeService = inject(TreeService); + + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, AgendaItem); this.setSortFunction((a, b) => a.tree_weight - b.tree_weight); // leave the sorting as it is diff --git a/client/src/app/gateways/repositories/assignments/assignment-candidate-repository.service/assignment-candidate-repository.service.ts b/client/src/app/gateways/repositories/assignments/assignment-candidate-repository.service/assignment-candidate-repository.service.ts index db09e2b801..cf89b24901 100644 --- a/client/src/app/gateways/repositories/assignments/assignment-candidate-repository.service/assignment-candidate-repository.service.ts +++ b/client/src/app/gateways/repositories/assignments/assignment-candidate-repository.service/assignment-candidate-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Action } from '@app/gateways/actions'; @@ -10,14 +10,13 @@ import { AssignmentCandidate } from '../../../../domain/models/assignments/assig import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { AssignmentCandidateAction } from './assignment-candidate.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class AssignmentCandidateRepositoryService extends BaseMeetingRelatedRepository< ViewAssignmentCandidate, AssignmentCandidate > { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, AssignmentCandidate); } diff --git a/client/src/app/gateways/repositories/assignments/assignment-repository.service/assignment-repository.service.ts b/client/src/app/gateways/repositories/assignments/assignment-repository.service/assignment-repository.service.ts index 906503eede..7b1e373f62 100644 --- a/client/src/app/gateways/repositories/assignments/assignment-repository.service/assignment-repository.service.ts +++ b/client/src/app/gateways/repositories/assignments/assignment-repository.service/assignment-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { AgendaItemRepositoryService } from '@app/gateways/repositories/agenda'; @@ -12,17 +12,14 @@ import { CreateResponse } from '../../base-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { AssignmentAction } from './assignment.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class AssignmentRepositoryService extends BaseAgendaItemAndListOfSpeakersContentObjectRepository< ViewAssignment, Assignment > { - public constructor( - repositoryServiceCollector: RepositoryMeetingServiceCollectorService, - agendaItemRepo: AgendaItemRepositoryService - ) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); + const agendaItemRepo = inject(AgendaItemRepositoryService); super(repositoryServiceCollector, Assignment, agendaItemRepo); } diff --git a/client/src/app/gateways/repositories/chat/chat-group-repository.service/chat-group-repository.service.ts b/client/src/app/gateways/repositories/chat/chat-group-repository.service/chat-group-repository.service.ts index 7f8e375887..f4c7d7f114 100644 --- a/client/src/app/gateways/repositories/chat/chat-group-repository.service/chat-group-repository.service.ts +++ b/client/src/app/gateways/repositories/chat/chat-group-repository.service/chat-group-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { ChatGroup } from '@app/domain/models/chat/chat-group'; @@ -8,11 +8,10 @@ import { BaseMeetingRelatedRepository } from '../../base-meeting-related-reposit import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { ChatGroupAction } from './chat-group.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ChatGroupRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, ChatGroup); } diff --git a/client/src/app/gateways/repositories/chat/chat-message-repository.service/chat-message-repository.service.ts b/client/src/app/gateways/repositories/chat/chat-message-repository.service/chat-message-repository.service.ts index ef2e289cd1..7d13a4e1fb 100644 --- a/client/src/app/gateways/repositories/chat/chat-message-repository.service/chat-message-repository.service.ts +++ b/client/src/app/gateways/repositories/chat/chat-message-repository.service/chat-message-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { ChatMessage } from '@app/domain/models/chat/chat-message'; @@ -13,9 +13,10 @@ import { ChatMessageAction } from './chat-message.action'; */ export const CHAT_MESSAGE_MAX_LENGTH = 512; -@Injectable({ providedIn: `root` }) +@Service() export class ChatMessageRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, ChatMessage); } diff --git a/client/src/app/gateways/repositories/committee-repository.service.ts b/client/src/app/gateways/repositories/committee-repository.service.ts index 2d4bb60866..0b36f02423 100644 --- a/client/src/app/gateways/repositories/committee-repository.service.ts +++ b/client/src/app/gateways/repositories/committee-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; import { BackendImportRawPreview } from '@app/ui/modules/import-list/definitions/backend-import-preview'; @@ -16,15 +16,13 @@ import { CommitteeAction } from './committees/committee.action'; import { RepositoryServiceCollectorService } from './repository-service-collector.service'; import { UserRepositoryService } from './users/user-repository.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class CommitteeRepositoryService extends BaseRepository { - public constructor( - repositoryServiceCollector: RepositoryServiceCollectorService, - private operator: OperatorService, - private userRepo: UserRepositoryService - ) { + private operator = inject(OperatorService); + private userRepo = inject(UserRepositoryService); + + public constructor() { + const repositoryServiceCollector = inject(RepositoryServiceCollectorService); super(repositoryServiceCollector, Committee); } diff --git a/client/src/app/gateways/repositories/gender/gender-repository.service.ts b/client/src/app/gateways/repositories/gender/gender-repository.service.ts index 56fa7c2127..d2f02b73b0 100644 --- a/client/src/app/gateways/repositories/gender/gender-repository.service.ts +++ b/client/src/app/gateways/repositories/gender/gender-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Gender } from '@app/domain/models/gender/gender'; @@ -10,11 +10,10 @@ import { Action } from '../../actions'; import { RepositoryServiceCollectorService } from '../repository-service-collector.service'; import { GenderAction } from './gender.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class GenderRepositoryService extends BaseRepository { - public constructor(repositoryServiceCollector: RepositoryServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryServiceCollectorService); super(repositoryServiceCollector, Gender); } diff --git a/client/src/app/gateways/repositories/groups/group-repository.service.ts b/client/src/app/gateways/repositories/groups/group-repository.service.ts index ec5c7f51c2..4f76f5b307 100644 --- a/client/src/app/gateways/repositories/groups/group-repository.service.ts +++ b/client/src/app/gateways/repositories/groups/group-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { Group } from '@app/domain/models/users/group'; import { BaseMeetingRelatedRepository } from '@app/gateways/repositories/base-meeting-related-repository'; @@ -8,11 +8,10 @@ import { Fieldsets } from '@app/site/services/model-request-builder'; import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; import { GroupAction } from './group.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class GroupRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, Group); } diff --git a/client/src/app/gateways/repositories/history-entry/history-entry-repository.service.ts b/client/src/app/gateways/repositories/history-entry/history-entry-repository.service.ts index 2fb78fb8a7..a6ed384857 100644 --- a/client/src/app/gateways/repositories/history-entry/history-entry-repository.service.ts +++ b/client/src/app/gateways/repositories/history-entry/history-entry-repository.service.ts @@ -1,15 +1,14 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { HistoryEntry } from '@app/domain/models/history-entry/history-entry'; import { BaseRepository } from '../base-repository'; import { RepositoryServiceCollectorService } from '../repository-service-collector.service'; import { ViewHistoryEntry } from './view-history-entry'; -@Injectable({ - providedIn: `root` -}) +@Service() export class HistoryEntryRepositoryService extends BaseRepository { - public constructor(repositoryServiceCollector: RepositoryServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryServiceCollectorService); super(repositoryServiceCollector, HistoryEntry); } diff --git a/client/src/app/gateways/repositories/history-position/history-position-repository.service.ts b/client/src/app/gateways/repositories/history-position/history-position-repository.service.ts index ae16152f61..11ef996791 100644 --- a/client/src/app/gateways/repositories/history-position/history-position-repository.service.ts +++ b/client/src/app/gateways/repositories/history-position/history-position-repository.service.ts @@ -1,14 +1,14 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { HistoryPosition } from '@app/domain/models/history-position/history-position'; import { BaseRepository } from '../base-repository'; import { RepositoryServiceCollectorService } from '../repository-service-collector.service'; import { ViewHistoryPosition } from './view-history-position'; -@Injectable({ - providedIn: `root` -}) + +@Service() export class HistoryPositionRepositoryService extends BaseRepository { - public constructor(repositoryServiceCollector: RepositoryServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryServiceCollectorService); super(repositoryServiceCollector, HistoryPosition); } diff --git a/client/src/app/gateways/repositories/mediafiles/mediafile-repository.service.ts b/client/src/app/gateways/repositories/mediafiles/mediafile-repository.service.ts index 2d27a3feed..0b1b9d9235 100644 --- a/client/src/app/gateways/repositories/mediafiles/mediafile-repository.service.ts +++ b/client/src/app/gateways/repositories/mediafiles/mediafile-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Mediafile } from '@app/domain/models/mediafiles/mediafile'; @@ -14,19 +14,17 @@ import { MeetingMediafileRepositoryService } from '../meeting-mediafile/meeting- import { RepositoryServiceCollectorService } from '../repository-service-collector.service'; import { MediafileAction } from './mediafile.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MediafileRepositoryService extends BaseRepository { private get activeMeetingId(): number { return this.activeMeetingService.meetingId!; } - public constructor( - repositoryServiceCollector: RepositoryServiceCollectorService, - private activeMeetingService: ActiveMeetingService, - private meetingMediaRepo: MeetingMediafileRepositoryService - ) { + private activeMeetingService = inject(ActiveMeetingService); + private meetingMediaRepo = inject(MeetingMediafileRepositoryService); + + public constructor() { + const repositoryServiceCollector = inject(RepositoryServiceCollectorService); super(repositoryServiceCollector, Mediafile); this.viewModelSortFn = (a: ViewMediafile, b: ViewMediafile): number => diff --git a/client/src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service.ts b/client/src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service.ts index 24435f5640..87092e55e6 100644 --- a/client/src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service.ts +++ b/client/src/app/gateways/repositories/meeting-mediafile/meeting-mediafile-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { MeetingMediafile } from '@app/domain/models/meeting-mediafile/meeting-mediafile'; import { ViewMeetingMediafile } from '@app/site/pages/meetings/pages/mediafiles/view-models/view-meeting-mediafile'; @@ -7,16 +7,14 @@ import { ActiveMeetingIdService } from '../../../site/pages/meetings/services/ac import { BaseRepository } from '../base-repository'; import { RepositoryServiceCollectorService } from '../repository-service-collector.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MeetingMediafileRepositoryService extends BaseRepository { private mediafileMap = new Map>(); - public constructor( - repositoryServiceCollector: RepositoryServiceCollectorService, - private activeMeetingIdService: ActiveMeetingIdService - ) { + private activeMeetingIdService = inject(ActiveMeetingIdService); + + public constructor() { + const repositoryServiceCollector = inject(RepositoryServiceCollectorService); super(repositoryServiceCollector, MeetingMediafile); this.viewModelSortFn = (a: ViewMeetingMediafile, b: ViewMeetingMediafile): number => diff --git a/client/src/app/gateways/repositories/meeting-repository.service.ts b/client/src/app/gateways/repositories/meeting-repository.service.ts index 347ff60475..835b028d4f 100644 --- a/client/src/app/gateways/repositories/meeting-repository.service.ts +++ b/client/src/app/gateways/repositories/meeting-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Action } from '@app/gateways/actions'; import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; import { getUnixTime } from 'date-fns'; @@ -36,15 +36,13 @@ export interface MeetingUserModifiedFields { removedAdmins?: ViewUser[]; } -@Injectable({ - providedIn: `root` -}) +@Service() export class MeetingRepositoryService extends BaseRepository { - public constructor( - repositoryServiceCollector: RepositoryServiceCollectorService, - private meetingSettingsDefinitionProvider: MeetingSettingsDefinitionService, - private orgaSettingsService: OrganizationSettingsService - ) { + private meetingSettingsDefinitionProvider = inject(MeetingSettingsDefinitionService); + private orgaSettingsService = inject(OrganizationSettingsService); + + public constructor() { + const repositoryServiceCollector = inject(RepositoryServiceCollectorService); super(repositoryServiceCollector, Meeting); } diff --git a/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts b/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts index c88ed6ae2d..d9ced6bb97 100644 --- a/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts +++ b/client/src/app/gateways/repositories/meeting_user/meeting-user-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { MeetingUser } from '@app/domain/models/meeting-users/meeting-user'; import { toDecimal } from '@app/infrastructure/utils'; @@ -11,15 +11,14 @@ import { RepositoryMeetingServiceCollectorService } from '../repository-meeting- export type MeetingUserPatchFn = { [key in keyof MeetingUser]?: any } | ((user: ViewMeetingUser) => { [key in keyof MeetingUser]?: any }); -@Injectable({ - providedIn: `root` -}) +@Service() export class MeetingUserRepositoryService extends BaseMeetingRelatedRepository { public override readonly resetOnMeetingChange = false; private meetingUserIdMap = new Map>(); - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, MeetingUser); } diff --git a/client/src/app/gateways/repositories/motions/motion-block-repository.service/motion-block-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-block-repository.service/motion-block-repository.service.ts index 06e8d367aa..3a8579e626 100644 --- a/client/src/app/gateways/repositories/motions/motion-block-repository.service/motion-block-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-block-repository.service/motion-block-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { ViewMotionBlock } from '@app/site/pages/meetings/pages/motions'; import { map, Observable } from 'rxjs'; @@ -9,17 +9,14 @@ import { BaseAgendaItemAndListOfSpeakersContentObjectRepository } from '../../ba import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { MotionBlockAction } from './motion-block.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionBlockRepositoryService extends BaseAgendaItemAndListOfSpeakersContentObjectRepository< ViewMotionBlock, MotionBlock > { - public constructor( - repositoryServiceCollector: RepositoryMeetingServiceCollectorService, - agendaItemRepo: AgendaItemRepositoryService - ) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); + const agendaItemRepo = inject(AgendaItemRepositoryService); super(repositoryServiceCollector, MotionBlock, agendaItemRepo); this.initSorting(); } diff --git a/client/src/app/gateways/repositories/motions/motion-category-repository.service/motion-category-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-category-repository.service/motion-category-repository.service.ts index 200c7b7626..e8b1cc0f40 100644 --- a/client/src/app/gateways/repositories/motions/motion-category-repository.service/motion-category-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-category-repository.service/motion-category-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { MotionCategory } from '@app/domain/models/motions/motion-category'; import { Action } from '@app/gateways/actions'; @@ -11,11 +11,10 @@ import { BaseMeetingRelatedRepository } from '../../base-meeting-related-reposit import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { MotionCategoryAction } from './motion-category.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionCategoryRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, MotionCategory); } diff --git a/client/src/app/gateways/repositories/motions/motion-change-recommendation-repository.service/motion-change-recommendation-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-change-recommendation-repository.service/motion-change-recommendation-repository.service.ts index 3bb8fa058d..8f3197bf4d 100644 --- a/client/src/app/gateways/repositories/motions/motion-change-recommendation-repository.service/motion-change-recommendation-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-change-recommendation-repository.service/motion-change-recommendation-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { MotionChangeRecommendation } from '@app/domain/models/motions/motion-change-recommendation'; import { ViewMotionChangeRecommendation } from '@app/site/pages/meetings/pages/motions'; @@ -7,14 +7,13 @@ import { BaseMeetingRelatedRepository } from '../../base-meeting-related-reposit import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { MotionChangeRecommendationAction } from './motion-change-recommendation.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionChangeRecommendationRepositoryService extends BaseMeetingRelatedRepository< ViewMotionChangeRecommendation, MotionChangeRecommendation > { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, MotionChangeRecommendation); } diff --git a/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-repository.service.ts index cdc69f519d..31a5469084 100644 --- a/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { MotionComment } from '@app/domain/models/motions/motion-comment'; import { ViewMotionComment } from '@app/site/pages/meetings/pages/motions'; @@ -7,11 +7,10 @@ import { BaseMeetingRelatedRepository } from '../../base-meeting-related-reposit import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { MotionCommentAction } from './motion-comment.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionCommentRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, MotionComment); } diff --git a/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-section-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-section-repository.service.ts index 116cf68568..9d8a1c973c 100644 --- a/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-section-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-comments/motion-comment-section-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { MotionCommentSection } from '@app/domain/models/motions/motion-comment-section'; import { ViewMotionCommentSection } from '@app/site/pages/meetings/pages/motions'; @@ -7,14 +7,13 @@ import { BaseMeetingRelatedRepository } from '../../base-meeting-related-reposit import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { MotionCommentSectionAction } from './motion-comment-section.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionCommentSectionRepositoryService extends BaseMeetingRelatedRepository< ViewMotionCommentSection, MotionCommentSection > { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, MotionCommentSection); this.viewModelSortFn = (a: ViewMotionCommentSection, b: ViewMotionCommentSection): number => { diff --git a/client/src/app/gateways/repositories/motions/motion-editor-repository/motion-editor-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-editor-repository/motion-editor-repository.service.ts index 2788dc8c46..c42c498b62 100644 --- a/client/src/app/gateways/repositories/motions/motion-editor-repository/motion-editor-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-editor-repository/motion-editor-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MotionEditor } from '@app/domain/models/motions/motion-editor'; import { ViewMotionEditor } from '../../../../site/pages/meetings/pages/motions/modules/editors/view-models/view-motion-editor'; @@ -6,16 +6,15 @@ import { RepositoryMeetingServiceCollectorService } from '../../repository-meeti import { BaseMotionMeetingUserRepositoryService } from '../util'; import { MotionEditorAction } from './motion-editor.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionEditorRepositoryService extends BaseMotionMeetingUserRepositoryService< ViewMotionEditor, MotionEditor > { protected sortPayloadField = `motion_editor_ids`; - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, MotionEditor, MotionEditorAction); } diff --git a/client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.ts index 1b79d7a4c8..5ef50841de 100644 --- a/client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Action } from '@app/gateways/actions'; @@ -21,9 +21,7 @@ import { MotionAction } from './motion.action'; type SortProperty = `sort_weight` | `number`; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionRepositoryService extends BaseAgendaItemAndListOfSpeakersContentObjectRepository< ViewMotion, Motion @@ -32,12 +30,11 @@ export class MotionRepositoryService extends BaseAgendaItemAndListOfSpeakersCont * The property the incoming data is sorted by */ protected sortProperty: SortProperty = `number`; + private treeService = inject(TreeService); - public constructor( - repositoryServiceCollector: RepositoryMeetingServiceCollectorService, - agendaItemRepo: AgendaItemRepositoryService, - private treeService: TreeService - ) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); + const agendaItemRepo = inject(AgendaItemRepositoryService); super(repositoryServiceCollector, Motion, agendaItemRepo); this.meetingSettingsService.get(`motions_default_sorting`).subscribe(conf => { this.sortProperty = conf as SortProperty; diff --git a/client/src/app/gateways/repositories/motions/motion-state-repository.service/motion-state-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-state-repository.service/motion-state-repository.service.ts index 060415f0c7..58171da20e 100644 --- a/client/src/app/gateways/repositories/motions/motion-state-repository.service/motion-state-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-state-repository.service/motion-state-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { MotionState } from '@app/domain/models/motions/motion-state'; import { Action } from '@app/gateways/actions'; @@ -9,11 +9,10 @@ import { BaseMeetingRelatedRepository } from '../../base-meeting-related-reposit import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { MotionStateAction } from './motion-state.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionStateRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, MotionState); } diff --git a/client/src/app/gateways/repositories/motions/motion-submitter-repository.service/motion-submitter-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-submitter-repository.service/motion-submitter-repository.service.ts index fc4b0078b5..b2d9c638c4 100644 --- a/client/src/app/gateways/repositories/motions/motion-submitter-repository.service/motion-submitter-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-submitter-repository.service/motion-submitter-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MotionSubmitter } from '@app/domain/models/motions/motion-submitter'; import { ViewMotionSubmitter } from '../../../../site/pages/meetings/pages/motions/modules/submitters/view-models/view-motion-submitter'; @@ -6,16 +6,15 @@ import { RepositoryMeetingServiceCollectorService } from '../../repository-meeti import { BaseMotionMeetingUserRepositoryService } from '../util'; import { MotionSubmitterAction } from './motion-submitter.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionSubmitterRepositoryService extends BaseMotionMeetingUserRepositoryService< ViewMotionSubmitter, MotionSubmitter > { protected sortPayloadField = `motion_submitter_ids`; - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, MotionSubmitter, MotionSubmitterAction); } diff --git a/client/src/app/gateways/repositories/motions/motion-supporter/motion-supporter-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-supporter/motion-supporter-repository.service.ts index 6790698154..7a3d498d23 100644 --- a/client/src/app/gateways/repositories/motions/motion-supporter/motion-supporter-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-supporter/motion-supporter-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { MotionSupporter } from '@app/domain/models/motions/motion-supporter'; import { Action } from '@app/gateways/actions'; @@ -8,9 +8,7 @@ import { BaseMeetingRelatedRepository } from '../../base-meeting-related-reposit import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { MotionSupporterAction } from './motion-supporter.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionSupporterRepositoryService extends BaseMeetingRelatedRepository< ViewMotionSupporter, MotionSupporter @@ -18,7 +16,8 @@ export class MotionSupporterRepositoryService extends BaseMeetingRelatedReposito public getVerboseName = (plural = false): string => this.translate.instant(plural ? `Motion supporters` : `Motion supporter`); - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, MotionSupporter); } diff --git a/client/src/app/gateways/repositories/motions/motion-workflow-repository.service/motion-workflow-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-workflow-repository.service/motion-workflow-repository.service.ts index 893112956f..c7b662836b 100644 --- a/client/src/app/gateways/repositories/motions/motion-workflow-repository.service/motion-workflow-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-workflow-repository.service/motion-workflow-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { MotionWorkflow } from '@app/domain/models/motions/motion-workflow'; import { Action } from '@app/gateways/actions'; @@ -9,11 +9,10 @@ import { BaseMeetingRelatedRepository } from '../../base-meeting-related-reposit import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { MotionWorkflowAction } from './motion-workflow.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionWorkflowRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, MotionWorkflow); } diff --git a/client/src/app/gateways/repositories/motions/motion-working-group-speaker-repository/motion-working-group-speaker-repository.service.ts b/client/src/app/gateways/repositories/motions/motion-working-group-speaker-repository/motion-working-group-speaker-repository.service.ts index 06c1e8cec5..4538317ca6 100644 --- a/client/src/app/gateways/repositories/motions/motion-working-group-speaker-repository/motion-working-group-speaker-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/motion-working-group-speaker-repository/motion-working-group-speaker-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MotionWorkingGroupSpeaker } from '@app/domain/models/motions/motion-working-group-speaker'; import { ViewMotionWorkingGroupSpeaker } from '../../../../site/pages/meetings/pages/motions/modules/working-group-speakers/view-models/view-motion-working-group-speaker'; @@ -6,16 +6,15 @@ import { RepositoryMeetingServiceCollectorService } from '../../repository-meeti import { BaseMotionMeetingUserRepositoryService } from '../util'; import { MotionWorkingGroupSpeakerAction } from './motion-working-group-speaker.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionWorkingGroupSpeakerRepositoryService extends BaseMotionMeetingUserRepositoryService< ViewMotionWorkingGroupSpeaker, MotionWorkingGroupSpeaker > { protected sortPayloadField = `motion_working_group_speaker_ids`; - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, MotionWorkingGroupSpeaker, MotionWorkingGroupSpeakerAction); } diff --git a/client/src/app/gateways/repositories/motions/personal-note-repository.service/personal-note-repository.service.ts b/client/src/app/gateways/repositories/motions/personal-note-repository.service/personal-note-repository.service.ts index d100fadf13..b7a82bcd56 100644 --- a/client/src/app/gateways/repositories/motions/personal-note-repository.service/personal-note-repository.service.ts +++ b/client/src/app/gateways/repositories/motions/personal-note-repository.service/personal-note-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Fqid } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { PersonalNote } from '@app/domain/models/motions/personal-note'; @@ -9,13 +9,10 @@ import { ViewPersonalNote } from '@app/site/pages/meetings/pages/motions'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; import { PersonalNoteAction } from './personal-note.action'; -/** - */ -@Injectable({ - providedIn: `root` -}) +@Service() export class PersonalNoteRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, PersonalNote); } diff --git a/client/src/app/gateways/repositories/organization-repository.service.ts b/client/src/app/gateways/repositories/organization-repository.service.ts index 47317ba7ad..50cb2db39c 100644 --- a/client/src/app/gateways/repositories/organization-repository.service.ts +++ b/client/src/app/gateways/repositories/organization-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ORGANIZATION_ID } from '@app/site/pages/organization/services/organization.service'; import { Organization, OrganizationAction, OrganizationSetting } from '../../domain/models/organizations/organization'; @@ -7,11 +7,10 @@ import { Fieldsets } from '../../site/services/model-request-builder'; import { BaseRepository } from './base-repository'; import { RepositoryServiceCollectorService } from './repository-service-collector.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class OrganizationRepositoryService extends BaseRepository { - public constructor(repositoryServiceCollector: RepositoryServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryServiceCollectorService); super(repositoryServiceCollector, Organization); } diff --git a/client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.ts b/client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.ts index 6ed382a8e5..42ac1ff0a5 100644 --- a/client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.ts +++ b/client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { PointOfOrderCategory } from '@app/domain/models/point-of-order-category/point-of-order-category'; @@ -11,14 +11,13 @@ import { CanPerformListUpdates } from '../base-repository'; import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; import { PointOfOrderCategoryAction } from './point-of-order-category.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class PointOfOrderCategoryRepositoryService extends BaseMeetingRelatedRepository implements CanPerformListUpdates { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, PointOfOrderCategory); } diff --git a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts index fbb108788e..dd6899c469 100644 --- a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts +++ b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { PollCandidateList } from '@app/domain/models/poll-candidate-lists/poll-candidate-list'; import { ViewPollCandidateList } from '@app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list'; import { DEFAULT_FIELDSET, Fieldsets } from '@app/site/services/model-request-builder'; @@ -17,14 +17,13 @@ import { RepositoryMeetingServiceCollectorService } from '../../repository-meeti * Should it ever become necessary to perform actions or call upon the ViewModelLists, * please create a new controller service instead of directly calling the repository. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class PollCandidateListRepositoryService extends BaseMeetingRelatedRepository< ViewPollCandidateList, PollCandidateList > { - public constructor(repoServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repoServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repoServiceCollector, PollCandidateList); } diff --git a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.ts b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.ts index 3d455e15c4..d4aa4baea8 100644 --- a/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.ts +++ b/client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate/poll-candidate-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { PollCandidate } from '@app/domain/models/poll-candidate-lists/poll-candidate'; import { ViewPollCandidate } from '@app/site/pages/meetings/pages/polls/view-models/view-poll-candidate'; import { DEFAULT_FIELDSET, Fieldsets } from '@app/site/services/model-request-builder'; @@ -16,11 +16,10 @@ import { RepositoryMeetingServiceCollectorService } from '../../repository-meeti * Should it ever become necessary to perform actions or call upon the ViewModelLists, * please create a new controller service instead of directly calling the repository. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class PollCandidateRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repoServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repoServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repoServiceCollector, PollCandidate); } diff --git a/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.ts b/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.ts index 52f14ce260..6774a5a50d 100644 --- a/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.ts +++ b/client/src/app/gateways/repositories/polls/option-repository.service/option-repository.service.ts @@ -1,15 +1,14 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Option } from '@app/domain/models/poll/option'; import { ViewOption } from '@app/site/pages/meetings/pages/polls'; import { BaseMeetingRelatedRepository } from '../../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../../repository-meeting-service-collector.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class OptionRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, Option); } diff --git a/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts b/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts index 9941a176d6..61abebc8e2 100644 --- a/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts +++ b/client/src/app/gateways/repositories/polls/poll-repository.service/poll-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Decimal } from '@app/domain/definitions/key-types'; import { Poll } from '@app/domain/models/poll/poll'; import { PollState, PollType } from '@app/domain/models/poll/poll-constants'; @@ -25,15 +25,13 @@ interface AnalogPollGlobalValues { amount_global_abstain?: Decimal; } -@Injectable({ - providedIn: `root` -}) +@Service() export class PollRepositoryService extends BaseMeetingRelatedRepository { - public constructor( - repoServiceCollector: RepositoryMeetingServiceCollectorService, - private voteController: VoteControllerService, - private voteRepo: VoteRepositoryService - ) { + private voteController = inject(VoteControllerService); + private voteRepo = inject(VoteRepositoryService); + + public constructor() { + const repoServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repoServiceCollector, Poll); } diff --git a/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.ts b/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.ts index a04e60aee5..ea63296549 100644 --- a/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.ts +++ b/client/src/app/gateways/repositories/polls/vote-repository.service/vote-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Vote } from '@app/domain/models/poll/vote'; import { HttpService } from '@app/gateways/http.service'; @@ -29,9 +29,7 @@ export interface VotePayload { value: any; } -@Injectable({ - providedIn: `root` -}) +@Service() export class VoteRepositoryService extends BaseMeetingRelatedRepository { private _subscribedPolls = new Map(); @@ -39,11 +37,11 @@ export class VoteRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, Projection); } diff --git a/client/src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service.ts b/client/src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service.ts index 87a8563b0e..22579ac109 100644 --- a/client/src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service.ts +++ b/client/src/app/gateways/repositories/projector-countdowns/projector-countdown-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { ProjectorCountdown } from '@app/domain/models/projector/projector-countdown'; import { ViewProjectorCountdown } from '@app/site/pages/meetings/pages/projectors'; @@ -8,17 +8,15 @@ import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; import { ProjectorCountdownAction } from './projector-countdown.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ProjectorCountdownRepositoryService extends BaseMeetingRelatedRepository< ViewProjectorCountdown, ProjectorCountdown > { - public constructor( - repositoryServiceCollector: RepositoryMeetingServiceCollectorService, - private serverTime: ServerTimeService - ) { + private serverTime = inject(ServerTimeService); + + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, ProjectorCountdown); } diff --git a/client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.ts b/client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.ts index ea63bcb183..e37e64fd91 100644 --- a/client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.ts +++ b/client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { ProjectorMessage } from '@app/domain/models/projector/projector-message'; import { ViewProjectorMessage } from '@app/site/pages/meetings/pages/projectors'; @@ -7,14 +7,13 @@ import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; import { ProjectorMessageAction } from './projector-message.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ProjectorMessageRepositoryService extends BaseMeetingRelatedRepository< ViewProjectorMessage, ProjectorMessage > { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, ProjectorMessage); } diff --git a/client/src/app/gateways/repositories/projectors/projector-repository.service.ts b/client/src/app/gateways/repositories/projectors/projector-repository.service.ts index a97e418e27..fd23058bbe 100644 --- a/client/src/app/gateways/repositories/projectors/projector-repository.service.ts +++ b/client/src/app/gateways/repositories/projectors/projector-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Projector } from '@app/domain/models/projector/projector'; @@ -14,11 +14,10 @@ import { ProjectorAction, ScrollScaleDirection } from './projector.action'; /** * Manages all projector instances. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class ProjectorRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, Projector); } diff --git a/client/src/app/gateways/repositories/repository-meeting-service-collector.service.ts b/client/src/app/gateways/repositories/repository-meeting-service-collector.service.ts index af3f6516a9..38dfe3c7f8 100644 --- a/client/src/app/gateways/repositories/repository-meeting-service-collector.service.ts +++ b/client/src/app/gateways/repositories/repository-meeting-service-collector.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, Observable } from 'rxjs'; @@ -12,9 +12,7 @@ import { ViewModelStoreService } from '../../site/services/view-model-store.serv import { ActionService } from '../actions'; import { RepositoryServiceCollectorService } from './repository-service-collector.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class RepositoryMeetingServiceCollectorService { public get DS(): DataStoreService { return this.repositoryServiceCollector.DS; @@ -44,12 +42,10 @@ export class RepositoryMeetingServiceCollectorService { return this.repositoryServiceCollector.collectionToKeyUpdatesObservableMap; } - public constructor( - private repositoryServiceCollector: RepositoryServiceCollectorService, - public activeMeetingIdService: ActiveMeetingIdService, - public activeMeetingService: ActiveMeetingService, - public meetingSettingsService: MeetingSettingsService - ) {} + private repositoryServiceCollector = inject(RepositoryServiceCollectorService); + public activeMeetingIdService = inject(ActiveMeetingIdService); + public activeMeetingService = inject(ActiveMeetingService); + public meetingSettingsService = inject(MeetingSettingsService); /** * Allows repositories to register if there have been updates on a certain key of their model, diff --git a/client/src/app/gateways/repositories/repository-service-collector.service.ts b/client/src/app/gateways/repositories/repository-service-collector.service.ts index 19b2cfd986..13a5a5cd17 100644 --- a/client/src/app/gateways/repositories/repository-service-collector.service.ts +++ b/client/src/app/gateways/repositories/repository-service-collector.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject, Observable } from 'rxjs'; @@ -8,20 +8,17 @@ import { RelationManagerService } from '../../site/services/relation-manager.ser import { ViewModelStoreService } from '../../site/services/view-model-store.service'; import { ActionService } from '../actions'; -@Injectable({ - providedIn: `root` -}) +@Service() export class RepositoryServiceCollectorService { public collectionToKeyUpdatesObservableMap: Record> = {}; - public constructor( - public DS: DataStoreService, - public actionService: ActionService, - public collectionMapperService: CollectionMapperService, - public viewModelStoreService: ViewModelStoreService, - public translate: TranslateService, - public relationManager: RelationManagerService // public errorService: ErrorService - ) {} + public DS = inject(DataStoreService); + public actionService = inject(ActionService); + public collectionMapperService = inject(CollectionMapperService); + public viewModelStoreService = inject(ViewModelStoreService); + public translate = inject(TranslateService); + public relationManager = inject(RelationManagerService); + // public errorService: ErrorService /** * Allows repositories to register if there have been updates on a certain key of their model, diff --git a/client/src/app/gateways/repositories/speakers/speaker-repository.service.ts b/client/src/app/gateways/repositories/speakers/speaker-repository.service.ts index 7cca422d49..715903d8d3 100644 --- a/client/src/app/gateways/repositories/speakers/speaker-repository.service.ts +++ b/client/src/app/gateways/repositories/speakers/speaker-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id, UnsafeHtml } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { ListOfSpeakers } from '@app/domain/models/list-of-speakers/list-of-speakers'; @@ -16,11 +16,10 @@ export interface PointOfOrderInformation { point_of_order_category_id?: Id; } -@Injectable({ - providedIn: `root` -}) +@Service() export class SpeakerRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, Speaker); } diff --git a/client/src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers-repository.service.ts b/client/src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers-repository.service.ts index 7d28e332d4..d7a3490431 100644 --- a/client/src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers-repository.service.ts +++ b/client/src/app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { StructureLevelListOfSpeakers } from '@app/domain/models/structure-levels/structure-level-list-of-speakers'; import { StructureLevelListOfSpeakersAction } from '@app/gateways/repositories/structure-level-list-of-speakers/structure-level-list-of-speakers.action'; @@ -7,14 +7,13 @@ import { ViewStructureLevelListOfSpeakers } from '@app/site/pages/meetings/pages import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository'; import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class StructureLevelListOfSpeakersRepositoryService extends BaseMeetingRelatedRepository< ViewStructureLevelListOfSpeakers, StructureLevelListOfSpeakers > { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, StructureLevelListOfSpeakers); } diff --git a/client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.ts b/client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.ts index b39106f190..5d1ed77219 100644 --- a/client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.ts +++ b/client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { _ } from '@ngx-translate/core'; @@ -10,11 +10,10 @@ import { BaseMeetingRelatedRepository } from '../base-meeting-related-repository import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; import { StructureLevelAction } from './structure-level.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class StructureLevelRepositoryService extends BaseMeetingRelatedRepository { - public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); super(repositoryServiceCollector, StructureLevel); } diff --git a/client/src/app/gateways/repositories/themes/theme-repository.service.ts b/client/src/app/gateways/repositories/themes/theme-repository.service.ts index 1ced0f7ff8..558f0b13b0 100644 --- a/client/src/app/gateways/repositories/themes/theme-repository.service.ts +++ b/client/src/app/gateways/repositories/themes/theme-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Theme } from '@app/domain/models/theme/theme'; @@ -9,11 +9,10 @@ import { Fieldsets } from '@app/site/services/model-request-builder'; import { RepositoryServiceCollectorService } from '../repository-service-collector.service'; import { ThemeAction } from './theme.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ThemeRepositoryService extends BaseRepository { - public constructor(repositoryServiceCollector: RepositoryServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryServiceCollectorService); super(repositoryServiceCollector, Theme); } diff --git a/client/src/app/gateways/repositories/topics/topic-repository.service.ts b/client/src/app/gateways/repositories/topics/topic-repository.service.ts index 5bcb8a3a1b..c9915f9aca 100644 --- a/client/src/app/gateways/repositories/topics/topic-repository.service.ts +++ b/client/src/app/gateways/repositories/topics/topic-repository.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Topic } from '@app/domain/models/topics/topic'; @@ -12,14 +12,11 @@ import { BaseAgendaItemAndListOfSpeakersContentObjectRepository } from '../base- import { RepositoryMeetingServiceCollectorService } from '../repository-meeting-service-collector.service'; import { TopicAction } from './topic.action'; -@Injectable({ - providedIn: `root` -}) +@Service() export class TopicRepositoryService extends BaseAgendaItemAndListOfSpeakersContentObjectRepository { - public constructor( - repositoryServiceCollector: RepositoryMeetingServiceCollectorService, - agendaItemRepo: AgendaItemRepositoryService - ) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryMeetingServiceCollectorService); + const agendaItemRepo = inject(AgendaItemRepositoryService); super(repositoryServiceCollector, Topic, agendaItemRepo); } diff --git a/client/src/app/gateways/repositories/users/user-repository.service.ts b/client/src/app/gateways/repositories/users/user-repository.service.ts index a2a2d9e0b8..d3cf50780f 100644 --- a/client/src/app/gateways/repositories/users/user-repository.service.ts +++ b/client/src/app/gateways/repositories/users/user-repository.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Fqid } from '@app/domain/definitions/key-types'; import { MeetingUser } from '@app/domain/models/meeting-users/meeting-user'; import { BaseRepository } from '@app/gateways/repositories/base-repository'; @@ -78,15 +78,14 @@ interface LevelAndNumberInformation { export type FullNameInformation = ShortNameInformation & LevelAndNumberInformation; -@Injectable({ - providedIn: `root` -}) +@Service() export class UserRepositoryService extends BaseRepository { private activeMeetingIdService = inject(ActiveMeetingIdService); private meetingSettingsService = inject(MeetingSettingsService); private meetingUserRepo = inject(MeetingUserRepositoryService); - public constructor(repositoryServiceCollector: RepositoryServiceCollectorService) { + public constructor() { + const repositoryServiceCollector = inject(RepositoryServiceCollectorService); super(repositoryServiceCollector, User); } diff --git a/client/src/app/gateways/server-time.service.ts b/client/src/app/gateways/server-time.service.ts index 397723e85e..098becd734 100644 --- a/client/src/app/gateways/server-time.service.ts +++ b/client/src/app/gateways/server-time.service.ts @@ -1,10 +1,8 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { LifecycleService } from '@app/site/services/lifecycle.service'; import { BehaviorSubject, Observable } from 'rxjs'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ServerTimeService { // TODO: couple this with the offlineService: Just retry often, if we are online. // When we are offline, this is not necessary. @@ -16,7 +14,8 @@ export class ServerTimeService { */ private readonly _serverOffsetSubject = new BehaviorSubject(0); - public constructor(lifecycleService: LifecycleService) { + public constructor() { + const lifecycleService = inject(LifecycleService); lifecycleService.appLoaded.subscribe(() => this.startScheduler()); } diff --git a/client/src/app/gateways/storage.service.ts b/client/src/app/gateways/storage.service.ts index 9fc0fbbc17..43d1193872 100644 --- a/client/src/app/gateways/storage.service.ts +++ b/client/src/app/gateways/storage.service.ts @@ -1,14 +1,12 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { StorageMap } from '@ngx-pwa/local-storage'; import { lastValueFrom, Observable } from 'rxjs'; -@Injectable({ - providedIn: `root` -}) +@Service() export class StorageService { private noClearKeys: string[] = []; - public constructor(private storage: StorageMap) {} + private storage = inject(StorageMap); public addNoClearKey(key: string): void { this.noClearKeys.push(key); diff --git a/client/src/app/infrastructure/utils/import/json-import-file-utils.ts b/client/src/app/infrastructure/utils/import/json-import-file-utils.ts index d6d3fe8e11..dc44e7971f 100644 --- a/client/src/app/infrastructure/utils/import/json-import-file-utils.ts +++ b/client/src/app/infrastructure/utils/import/json-import-file-utils.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { FileData } from '@app/ui/modules/file-upload/components/file-upload/file-upload.component'; import { _ } from '@ngx-translate/core'; @@ -6,9 +6,7 @@ import { TranslateService } from '@ngx-translate/core'; export const WRONG_JSON_IMPORT_FORMAT_ERROR_MSG = _(`Import data needs to have the JSON format`); -@Injectable({ - providedIn: `root` -}) +@Service() export class UploadFileJsonProcessorService { private snackbar = inject(MatSnackBar); private translate = inject(TranslateService); diff --git a/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.ts b/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.ts index c33975e728..89592264db 100644 --- a/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.ts +++ b/client/src/app/openslides-main-module/interceptors/auth-token.interceptor.ts @@ -6,12 +6,12 @@ import { HttpRequest, HttpResponse } from '@angular/common/http'; -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Observable, tap } from 'rxjs'; import { AuthTokenService } from '../../site/services/auth-token.service'; -@Injectable() +@Service() export class AuthTokenInterceptor implements HttpInterceptor { private authTokenService = inject(AuthTokenService); diff --git a/client/src/app/openslides-main-module/services/app-load.service.ts b/client/src/app/openslides-main-module/services/app-load.service.ts index 90f5fcd15a..9f7b0eb59b 100644 --- a/client/src/app/openslides-main-module/services/app-load.service.ts +++ b/client/src/app/openslides-main-module/services/app-load.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable, Injector, Type } from '@angular/core'; +import { inject, Injector, Service, Type } from '@angular/core'; import { ActionWorkerAppConfig } from '@app/gateways/repositories/action-worker/action-worker.config'; import { BaseRepository } from '@app/gateways/repositories/base-repository'; import { MeetingUserAppConfig } from '@app/gateways/repositories/meeting_user/meeting-user-config'; @@ -60,9 +60,7 @@ const appConfigs: AppConfig[] = [ GendersAppConfig ]; -@Injectable({ - providedIn: `root` -}) +@Service() export class AppLoadService { private injector = inject(Injector); private modelMapper = inject(CollectionMapperService); diff --git a/client/src/app/openslides-main-module/services/dom.service.ts b/client/src/app/openslides-main-module/services/dom.service.ts index f602637652..92c166c340 100644 --- a/client/src/app/openslides-main-module/services/dom.service.ts +++ b/client/src/app/openslides-main-module/services/dom.service.ts @@ -1,4 +1,4 @@ -import { ComponentRef, DOCUMENT, EmbeddedViewRef, Inject, Injectable, Type, ViewContainerRef } from '@angular/core'; +import { ComponentRef, DOCUMENT, EmbeddedViewRef, inject, Service, Type, ViewContainerRef } from '@angular/core'; interface BodyPortalConstructConfig { /** @@ -61,9 +61,7 @@ export class BodyPortal { } } -@Injectable({ - providedIn: `root` -}) +@Service() export class DomService { private get hostElement(): HTMLElement { return this.document.body; @@ -72,7 +70,9 @@ export class DomService { private _viewContainer: ViewContainerRef | null = null; private _pane: HTMLElement | null = null; - public constructor(@Inject(DOCUMENT) private document: Document) { + private document = inject(DOCUMENT); + + public constructor() { this._pane = this.createPane(); this.hostElement.appendChild(this._pane); } diff --git a/client/src/app/openslides-main-module/services/shared-worker.service.ts b/client/src/app/openslides-main-module/services/shared-worker.service.ts index ee7a401a93..7c53010f7e 100644 --- a/client/src/app/openslides-main-module/services/shared-worker.service.ts +++ b/client/src/app/openslides-main-module/services/shared-worker.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable, NgZone } from '@angular/core'; +import { inject, NgZone, Service } from '@angular/core'; import { SW_BROADCAST_CHANNEL_NAME, WorkerMessage, WorkerMessageContent, WorkerResponse } from '@app/worker/interfaces'; import { defer, @@ -29,9 +29,7 @@ const SHARED_WORKER_HEALTHCHECK_INTERVAL = 5000; const SHARED_WORKER_HEALTH_RESPONSE_TIMEOUT = 8000; const SHARED_WORKER_HEALTH_RETRIES = 2; -@Injectable({ - providedIn: `root` -}) +@Service() export class SharedWorkerService { public messages = new Subject(); diff --git a/client/src/app/site/guards/auth.guard.ts b/client/src/app/site/guards/auth.guard.ts index 39abdfd2d5..28f2cf41d4 100644 --- a/client/src/app/site/guards/auth.guard.ts +++ b/client/src/app/site/guards/auth.guard.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router'; import { AuthCheckService } from '../services/auth-check.service'; @@ -12,9 +12,7 @@ enum CannotAccessReason { NO_SETTING } -@Injectable({ - providedIn: `root` -}) +@Service() export class AuthGuard { private _cannotAccessReason: CannotAccessReason | null = null; diff --git a/client/src/app/site/guards/permission.guard.ts b/client/src/app/site/guards/permission.guard.ts index 0761855b49..eb07f5f725 100644 --- a/client/src/app/site/guards/permission.guard.ts +++ b/client/src/app/site/guards/permission.guard.ts @@ -1,13 +1,11 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Route, Router, UrlSegment, UrlTree } from '@angular/router'; import { AuthCheckService } from '../services/auth-check.service'; import { OpenSlidesRouterService } from '../services/openslides-router.service'; import { RerouteService } from '../services/reroute.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class PermissionGuard { private authCheck = inject(AuthCheckService); private osRouter = inject(OpenSlidesRouterService); diff --git a/client/src/app/site/guards/watch-for-changes.guard.ts b/client/src/app/site/guards/watch-for-changes.guard.ts index ed9a202b02..7db092fc6a 100644 --- a/client/src/app/site/guards/watch-for-changes.guard.ts +++ b/client/src/app/site/guards/watch-for-changes.guard.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; /** * Interface to describe the function that is necessary. @@ -7,9 +7,7 @@ export interface CanComponentDeactivate { canDeactivate: () => Promise; } -@Injectable({ - providedIn: `root` -}) +@Service() export class WatchForChangesGuard { /** * Function to determine whether the route will change or not. diff --git a/client/src/app/site/modules/global-headbar/global-headbar.service.ts b/client/src/app/site/modules/global-headbar/global-headbar.service.ts index 788921eb88..70f376168e 100644 --- a/client/src/app/site/modules/global-headbar/global-headbar.service.ts +++ b/client/src/app/site/modules/global-headbar/global-headbar.service.ts @@ -1,7 +1,7 @@ import { TemplatePortal } from '@angular/cdk/portal'; -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; -@Injectable({ providedIn: `root` }) +@Service() export class GlobalHeadbarService { private _headbar: TemplatePortal = null; private _additionalHeadbar: TemplatePortal = null; diff --git a/client/src/app/site/modules/global-spinner/services/spinner.service.ts b/client/src/app/site/modules/global-spinner/services/spinner.service.ts index fa272054d0..ddef07a060 100644 --- a/client/src/app/site/modules/global-spinner/services/spinner.service.ts +++ b/client/src/app/site/modules/global-spinner/services/spinner.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { EventType, Router, RoutesRecognized } from '@angular/router'; import { ConnectionStatusService } from '@app/site/services/connection-status.service'; import { OpenSlidesStatusService } from '@app/site/services/openslides-status.service'; @@ -9,9 +9,7 @@ import { combineLatest, filter, startWith, Subscription } from 'rxjs'; import { GlobalSpinnerComponent } from '../components/global-spinner/global-spinner.component'; import { SpinnerConfig } from '../definitions'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class SpinnerService { private overlayInstance: OverlayInstance | null = null; @@ -31,13 +29,11 @@ export class SpinnerService { private isStableSubscription: Subscription | null = null; - public constructor( - private overlay: OverlayService, - private offlineService: ConnectionStatusService, - private openslidesStatus: OpenSlidesStatusService, - private operator: OperatorService, - private router: Router - ) {} + private overlay = inject(OverlayService); + private offlineService = inject(ConnectionStatusService); + private openslidesStatus = inject(OpenSlidesStatusService); + private operator = inject(OperatorService); + private router = inject(Router); public show(text?: string, config: SpinnerConfig = {}): OverlayInstance { if (this.overlayInstance) { diff --git a/client/src/app/site/modules/site-wrapper/services/banner.service.ts b/client/src/app/site/modules/site-wrapper/services/banner.service.ts index a2082c4fd8..d090a5ba32 100644 --- a/client/src/app/site/modules/site-wrapper/services/banner.service.ts +++ b/client/src/app/site/modules/site-wrapper/services/banner.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { Constructable } from '@app/domain/interfaces/constructable'; import { BehaviorSubject, Observable } from 'rxjs'; @@ -13,9 +13,7 @@ export class BannerDefinition { public component?: Constructable; } -@Injectable({ - providedIn: `root` -}) +@Service() export class BannerService { private get currentBanners(): BannerDefinition[] { return this._activeBanners.value; diff --git a/client/src/app/site/modules/site-wrapper/services/update.service.ts b/client/src/app/site/modules/site-wrapper/services/update.service.ts index 2fe3654d6c..c6fcd599b1 100644 --- a/client/src/app/site/modules/site-wrapper/services/update.service.ts +++ b/client/src/app/site/modules/site-wrapper/services/update.service.ts @@ -1,11 +1,9 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { SwUpdate, VersionReadyEvent } from '@angular/service-worker'; import { StorageService } from '@app/gateways/storage.service'; import { filter, Observable, Subject } from 'rxjs'; -@Injectable({ - providedIn: `root` -}) +@Service() export class UpdateService { /** * @returns the updateSubscription @@ -20,6 +18,8 @@ export class UpdateService { } private _nextVersionAvailableSubject = new Subject(); + private swUpdate = inject(SwUpdate); + private store = inject(StorageService); /** * Constructor. @@ -27,11 +27,8 @@ export class UpdateService { * * @param swUpdate Service Worker update service */ - public constructor( - private swUpdate: SwUpdate, - private store: StorageService - ) { - swUpdate.versionUpdates + public constructor() { + this.swUpdate.versionUpdates .pipe(filter(event => event.type === `VERSION_READY`)) .subscribe((version: VersionReadyEvent) => this.checkVersion(version)); } diff --git a/client/src/app/site/modules/site-wrapper/services/voting-banner.service.ts b/client/src/app/site/modules/site-wrapper/services/voting-banner.service.ts index 7581423728..c5a0d85dcc 100644 --- a/client/src/app/site/modules/site-wrapper/services/voting-banner.service.ts +++ b/client/src/app/site/modules/site-wrapper/services/voting-banner.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Permission } from '@app/domain/definitions/permission'; import { viewModelListEqual } from '@app/infrastructure/utils'; @@ -20,9 +20,7 @@ interface BannerCreationData { link: string; } -@Injectable({ - providedIn: 'root' -}) +@Service() export class VotingBannerService { private currentBanner: BannerDefinition; @@ -31,16 +29,16 @@ export class VotingBannerService { private pollsToVote: ViewPoll[] = []; private pollsToVoteSubscription: Subscription; - public constructor( - private banner: BannerService, - private translate: TranslateService, - private votingService: VotingService, - private activeMeeting: ActiveMeetingService, - private sendVotesService: VoteControllerService, - private operator: OperatorService, - private activePolls: ActivePollsService, - private meetingSettingsService: MeetingSettingsService - ) { + private banner = inject(BannerService); + private translate = inject(TranslateService); + private votingService = inject(VotingService); + private activeMeeting = inject(ActiveMeetingService); + private sendVotesService = inject(VoteControllerService); + private operator = inject(OperatorService); + private activePolls = inject(ActivePollsService); + private meetingSettingsService = inject(MeetingSettingsService); + + public constructor() { combineLatest([ this.activeMeeting.meetingIdObservable.pipe(distinctUntilChanged()), this.activePolls.activePollsObservable.pipe( diff --git a/client/src/app/site/modules/translations/custom-translation.service.ts b/client/src/app/site/modules/translations/custom-translation.service.ts index 8ec51f505d..f314c83204 100644 --- a/client/src/app/site/modules/translations/custom-translation.service.ts +++ b/client/src/app/site/modules/translations/custom-translation.service.ts @@ -1,11 +1,9 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; export type CustomTranslation = Record; -@Injectable({ - providedIn: `root` -}) +@Service() export class CustomTranslationService { public readonly customTranslationSubject = new BehaviorSubject({}); } diff --git a/client/src/app/site/modules/user-components/services/user-delete-dialog.service.ts b/client/src/app/site/modules/user-components/services/user-delete-dialog.service.ts index 1d9b53f58a..e179fcf7e3 100644 --- a/client/src/app/site/modules/user-components/services/user-delete-dialog.service.ts +++ b/client/src/app/site/modules/user-components/services/user-delete-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { GetUserRelatedModelsPresenterResult, @@ -17,15 +17,14 @@ interface UserDeleteDialogOpenConfig { relatedModelsResult?: GetUserRelatedModelsPresenterResult; } -@Injectable({ - providedIn: 'root' -}) +@Service() export class UserDeleteDialogService extends BaseDialogService< UserDeleteDialogComponent, UserDeleteDialogOpenConfig, boolean > { - public constructor(private userRelatedModelsPresenter: GetUserRelatedModelsPresenterService) { + private userRelatedModelsPresenter = inject(GetUserRelatedModelsPresenterService); + public constructor() { super(); } diff --git a/client/src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service.ts b/client/src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service.ts index 2f7a2d441d..b040b8dd39 100644 --- a/client/src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service.ts +++ b/client/src/app/site/modules/wait-for-action-dialog/services/wait-for-action-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Injector } from '@angular/core'; +import { inject, Injector, Service } from '@angular/core'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { Id } from '@app/domain/definitions/key-types'; import { ActionWorker } from '@app/domain/models/action-worker/action-worker'; @@ -12,9 +12,7 @@ import { StoppedWaitingForActionDialogComponent } from '../components/stopped-wa import { WaitForActionBannerComponent } from '../components/wait-for-action-banner/wait-for-action-banner.component'; import { WaitForActionData, WaitForActionReason } from '../definitions'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class WaitForActionDialogService { public get currentReasonObservable(): Observable { return this._currentReasonObservable; @@ -64,12 +62,10 @@ export class WaitForActionDialogService { private _snapshots = new BehaviorSubject<(Partial & { closed: number })[]>([]); - public constructor( - private injector: Injector, - private dialog: MatDialog, - private repo: ActionWorkerRepositoryService, - private bannerService: BannerService - ) {} + private injector = inject(Injector); + private dialog = inject(MatDialog); + private repo = inject(ActionWorkerRepositoryService); + private bannerService = inject(BannerService); public addNewDialog(reason: WaitForActionReason, data: WaitForActionData): void { this.removeAllDates(data.workerId); diff --git a/client/src/app/site/pages/login/services/browser-support.service.ts b/client/src/app/site/pages/login/services/browser-support.service.ts index 4dc4a06be1..153fbc384a 100644 --- a/client/src/app/site/pages/login/services/browser-support.service.ts +++ b/client/src/app/site/pages/login/services/browser-support.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { DeviceDetectorService, DeviceInfo } from 'ngx-device-detector'; const SmallestSupportedBrowserVersion: any = { @@ -17,9 +17,7 @@ export interface BrowserRecommendation { url: string; } -@Injectable({ - providedIn: `root` -}) +@Service() export class BrowserSupportService { public readonly recommendedBrowsers: BrowserRecommendation[] = [ { @@ -32,7 +30,7 @@ export class BrowserSupportService { } ]; - public constructor(private deviceService: DeviceDetectorService) {} + private deviceService = inject(DeviceDetectorService); public getDeviceInfo(): DeviceInfo { return this.deviceService.getDeviceInfo(); diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/services/point-of-order-dialog.service.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/services/point-of-order-dialog.service.ts index 6fc97bda8b..a7358d6d59 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/services/point-of-order-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/point-of-order-dialog/services/point-of-order-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { Id } from '@app/domain/definitions/key-types'; import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; @@ -11,9 +11,7 @@ export interface PointOfOrderData { point_of_order_category_id?: Id; } -@Injectable({ - providedIn: 'root' -}) +@Service() export class PointOfOrderDialogService extends BaseDialogService< PointOfOrderDialogComponent, PointOfOrderData, diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/services/speaker-user-select-dialog.service.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/services/speaker-user-select-dialog.service.ts index 5dad911676..d17ae8135e 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/services/speaker-user-select-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/modules/speaker-user-select-dialog/services/speaker-user-select-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { Id } from '@app/domain/definitions/key-types'; import { SpeechState } from '@app/domain/models/speakers/speech-state'; @@ -7,16 +7,13 @@ import { ViewListOfSpeakers } from '@app/site/pages/meetings/pages/agenda'; import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { SpeakerUserSelectDialogComponent } from '../components/speaker-user-select-dialog/speaker-user-select-dialog.component'; -import { SpeakerUserSelectDialogModule } from '../speaker-user-select-dialog.module'; interface SpeakerUserSelectResult { meeting_user_id: Id; structure_level_id?: Id; } -@Injectable({ - providedIn: SpeakerUserSelectDialogModule -}) +@Service() export class SpeakerUserSelectDialogService extends BaseDialogService< SpeakerUserSelectDialogComponent, ViewListOfSpeakers, diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/services/moderation-note-pdf.service/moderation-note-pdf.service.ts b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/services/moderation-note-pdf.service/moderation-note-pdf.service.ts index f273d31716..6e6c2bd971 100644 --- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/services/moderation-note-pdf.service/moderation-note-pdf.service.ts +++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/services/moderation-note-pdf.service/moderation-note-pdf.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { HtmlToPdfService } from '@app/gateways/export/html-to-pdf.service'; import { MeetingPdfExportService } from '@app/site/pages/meetings/services/export'; import { TranslateService } from '@ngx-translate/core'; @@ -7,13 +7,11 @@ import { Content, ContentText } from 'pdfmake/interfaces'; /** * Creates a PDF document from a single tpoic */ -@Injectable() +@Service() export class ModerationNotePdfService { - public constructor( - private translate: TranslateService, - private htmlToPdfService: HtmlToPdfService, - private pdfDocumentService: MeetingPdfExportService - ) {} + private translate = inject(TranslateService); + private htmlToPdfService = inject(HtmlToPdfService); + private pdfDocumentService = inject(MeetingPdfExportService); /** * Generates an pdf out of a given topic and saves it as file diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/services/agenda-content-object-form.service.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/services/agenda-content-object-form.service.ts index 0b9c4e002c..546a46fc88 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/services/agenda-content-object-form.service.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/agenda-content-object-form/services/agenda-content-object-form.service.ts @@ -1,16 +1,14 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { AgendaItemRepositoryService } from '@app/gateways/repositories/agenda'; import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; import { Observable } from 'rxjs'; import { ViewAgendaItem } from '../../../../pages/agenda'; -@Injectable({ providedIn: 'root' }) +@Service() export class AgendaContentObjectFormService { - public constructor( - private repo: AgendaItemRepositoryService, - private activeMeetingIdService: ActiveMeetingIdService - ) {} + private repo = inject(AgendaItemRepositoryService); + private activeMeetingIdService = inject(ActiveMeetingIdService); public getViewModelListObservable(): Observable { return this.repo.getViewModelListObservable(); diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/services/projectable-list.service.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/services/projectable-list.service.ts index aa1210a558..bdebf5505a 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/services/projectable-list.service.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projectable-list/services/projectable-list.service.ts @@ -1,14 +1,12 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; import { isProjectable, Projectable, ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models'; -@Injectable() +@Service() export class ProjectableListService { - public constructor( - private activeMeetingService: ActiveMeetingService, - private meetingSettingsService: MeetingSettingsService - ) {} + private activeMeetingService = inject(ActiveMeetingService); + private meetingSettingsService = inject(MeetingSettingsService); public isProjected(model: ProjectionBuildDescriptor | Projectable | null): boolean { if (!model) { diff --git a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.ts b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.ts index facb88e6c2..7eaa4fbf0f 100644 --- a/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/meetings-component-collector/projection-dialog/services/projection-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ProjectorControllerService } from '@app/site/pages/meetings/pages/projectors/services/projector-controller.service'; import { @@ -15,12 +15,10 @@ import { } from '../components/projection-dialog/projection-dialog.component'; import { ProjectionDialogReturnType } from '../definitions'; -@Injectable({ providedIn: 'root' }) +@Service() export class ProjectionDialogService { - public constructor( - private dialog: MatDialog, - private projectorRepo: ProjectorControllerService - ) {} + private dialog = inject(MatDialog); + private projectorRepo = inject(ProjectorControllerService); /** * Opens the projection dialog for the given projectable. After the user's choice, diff --git a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service.ts b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service.ts index eb84a9e95c..da0dcb2a0d 100644 --- a/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/base/base-poll-dialog.service.ts @@ -1,5 +1,5 @@ import { ComponentType } from '@angular/cdk/portal'; -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { PollContentObject } from '@app/domain/models/poll'; import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; @@ -8,12 +8,10 @@ import { PollControllerService } from '@app/site/pages/meetings/modules/poll/ser import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; import { firstValueFrom } from 'rxjs'; -@Injectable({ providedIn: 'root' }) +@Service() export abstract class BasePollDialogService { - public constructor( - private controller: PollControllerService, - private dialogService: MatDialog - ) {} + private controller = inject(PollControllerService); + private dialogService = inject(MatDialog); public async open(data: Partial | ViewPoll): Promise { const dialogRef = this.dialogService.open | ViewPoll, PollDialogResult>( diff --git a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.ts b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.ts index 038590869b..06b8d7ec5e 100644 --- a/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/modules/voting-privacy-dialog/services/voting-privacy-warning-dialog.service.ts @@ -1,13 +1,11 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { VotingPrivacyWarningDialogComponent } from '../components/voting-privacy-warning-dialog/voting-privacy-warning-dialog.component'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class VotingPrivacyWarningDialogService extends BaseDialogService< VotingPrivacyWarningDialogComponent, void, diff --git a/client/src/app/site/pages/meetings/modules/poll/services/entitled-user-filter.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/entitled-user-filter.service.ts index 1547489f0f..d2c805f62a 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/entitled-user-filter.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/entitled-user-filter.service.ts @@ -1,15 +1,14 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { BaseFilterListService, OsFilter } from '@app/site/base/base-filter.service'; import { ActiveFiltersService } from '@app/site/services/active-filters.service'; import { _ } from '@ngx-translate/core'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class EntitledUsersListFilterService extends BaseFilterListService { protected storageKey = `EntitledUsersEntry`; - public constructor(store: ActiveFiltersService) { + public constructor() { + const store = inject(ActiveFiltersService); super(store); } diff --git a/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.ts index 9d7727bfd5..75dbea038c 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/poll-controller.service/poll-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Fqid } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Poll } from '@app/domain/models/poll/poll'; @@ -12,13 +12,14 @@ import { distinctUntilChanged, map, Observable } from 'rxjs'; import { ViewPoll } from '../../../../pages/polls'; -@Injectable({ providedIn: `root` }) +@Service() export class PollControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: PollRepositoryService, - protected voteRepo: VoteRepositoryService - ) { + protected override repo: PollRepositoryService; + protected voteRepo = inject(VoteRepositoryService); + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(PollRepositoryService); super(controllerServiceCollector, Poll, repo); this.getViewModelListObservableOfStarted() diff --git a/client/src/app/site/pages/meetings/modules/poll/services/poll-dialog.service/poll-dialog.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/poll-dialog.service/poll-dialog.service.ts index 1f09d03315..1db22e02d7 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/poll-dialog.service/poll-dialog.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/poll-dialog.service/poll-dialog.service.ts @@ -1,14 +1,12 @@ import { ComponentType } from '@angular/cdk/portal'; -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; import { firstValueFrom } from 'rxjs'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class PollDialogService { - public constructor(private dialog: MatDialog) {} + private dialog = inject(MatDialog); public async open( dialogComponent: ComponentType | Promise>, diff --git a/client/src/app/site/pages/meetings/modules/poll/services/poll-service-mapper.service/poll-service-mapper.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/poll-service-mapper.service/poll-service-mapper.service.ts index 4ac808047c..abdb18764b 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/poll-service-mapper.service/poll-service-mapper.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/poll-service-mapper.service/poll-service-mapper.service.ts @@ -1,8 +1,8 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { PollService } from '../poll.service/poll.service'; -@Injectable({ providedIn: 'root' }) +@Service() export class PollServiceMapperService { private _registry: Record = {}; diff --git a/client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts index ab7cc67f84..549ab59610 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/poll.service/poll.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { OptionData, PollData } from '@app/domain/models/poll/generic-poll'; import { OptionDataKey } from '@app/domain/models/poll/generic-poll'; import { @@ -34,7 +34,7 @@ import { ActiveMeetingService } from '../../../../services/active-meeting.servic const PollChartBarThickness = 20; const PERCENT_DECIMAL_PLACES = 3; -@Injectable({ providedIn: 'root' }) +@Service() export abstract class PollService { protected sortByVote = false; protected enableMaxVotesPerOption = false; diff --git a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.ts index ad8cc4161c..5235c42df0 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/vote-controller.service/vote-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Vote } from '@app/domain/models/poll/vote'; import { VoteRepositoryService } from '@app/gateways/repositories/polls/vote-repository.service'; @@ -9,15 +9,14 @@ import { Observable } from 'rxjs'; import { ViewPoll, ViewVote } from '../../../../pages/polls'; -@Injectable({ - providedIn: `root` -}) +@Service() export class VoteControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: VoteRepositoryService, - private operator: OperatorService - ) { + protected override repo: VoteRepositoryService; + private operator = inject(OperatorService); + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(VoteRepositoryService); super(controllerServiceCollector, Vote, repo); } diff --git a/client/src/app/site/pages/meetings/modules/poll/services/votes-filter.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/votes-filter.service.ts index 45b21e8c5f..68d5f99c76 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/votes-filter.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/votes-filter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { BaseFilterListService, OsFilter } from '@app/site/base/base-filter.service'; import { ActiveFiltersService } from '@app/site/services/active-filters.service'; @@ -6,9 +6,7 @@ import { GroupControllerService } from '../../../pages/participants'; import { StructureLevelControllerService } from '../../../pages/participants/pages/structure-levels/services/structure-level-controller.service'; import { ViewVote } from '../../../pages/polls'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class VotesFilterService extends BaseFilterListService { protected storageKey = `VotesEntry`; @@ -24,11 +22,10 @@ export class VotesFilterService extends BaseFilterListService { options: [] }; - public constructor( - store: ActiveFiltersService, - groupRepo: GroupControllerService, - structureRepo: StructureLevelControllerService - ) { + public constructor() { + const store = inject(ActiveFiltersService); + const groupRepo = inject(GroupControllerService); + const structureRepo = inject(StructureLevelControllerService); super(store); this.updateFilterForRepo({ diff --git a/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.ts b/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.ts index 8cbca8e162..525f091328 100644 --- a/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.ts +++ b/client/src/app/site/pages/meetings/modules/poll/services/voting.service/voting.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { PollState, PollType } from '@app/domain/models/poll/poll-constants'; import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; @@ -31,19 +31,17 @@ const VotingProhibitionVerbose = { [VotingProhibition.USER_HAS_VOTED]: _(`You have already voted.`) }; -@Injectable({ - providedIn: 'root' -}) +@Service() export class VotingService { private _currentUser: ViewUser | null = null; private _voteDelegationEnabled = false; private _forbidDelegationToVote = false; - public constructor( - private activeMeetingService: ActiveMeetingService, - private operator: OperatorService, - private meetingSettingsService: MeetingSettingsService - ) { + private activeMeetingService = inject(ActiveMeetingService); + private operator = inject(OperatorService); + private meetingSettingsService = inject(MeetingSettingsService); + + public constructor() { this.operator.userObservable.subscribe(user => (this._currentUser = user)); this.meetingSettingsService .get(`users_enable_vote_delegations`) diff --git a/client/src/app/site/pages/meetings/pages/agenda/components/agenda-forward-dialog/services/agenda-forward-dialog.service.ts b/client/src/app/site/pages/meetings/pages/agenda/components/agenda-forward-dialog/services/agenda-forward-dialog.service.ts index 9afa31729e..1ca9ba2346 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/components/agenda-forward-dialog/services/agenda-forward-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/components/agenda-forward-dialog/services/agenda-forward-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable, OnDestroy } from '@angular/core'; +import { inject, OnDestroy, Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Ids } from '@app/domain/definitions/key-types'; @@ -30,9 +30,7 @@ export interface AgendaForwardDialogPayload { showSkippedItemWarning: boolean; } -@Injectable({ - providedIn: 'root' -}) +@Service() export class AgendaForwardDialogService extends BaseDialogService implements OnDestroy @@ -53,15 +51,15 @@ export class AgendaForwardDialogService private _committeeMeetingSubscription: Subscription; private _activeMeetingSubscription: Subscription; - public constructor( - private translate: TranslateService, - private repo: AgendaItemControllerService, - private snackbar: MatSnackBar, - private activeMeeting: ActiveMeetingService, - private autoupdate: AutoupdateService, - private modelRequestBuilder: ModelRequestBuilderService, - private operator: OperatorService - ) { + private translate = inject(TranslateService); + private repo = inject(AgendaItemControllerService); + private snackbar = inject(MatSnackBar); + private activeMeeting = inject(ActiveMeetingService); + private autoupdate = inject(AutoupdateService); + private modelRequestBuilder = inject(ModelRequestBuilderService); + private operator = inject(OperatorService); + + public constructor() { super(); this.updateCommitteeMeetingSubscription(); diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service.ts index 6bd4597531..f340918be1 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers-slide.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { PROJECTIONDEFAULT } from '@app/domain/models/projector/projection-default'; import { MeetingProjectionType } from '@app/gateways/repositories/meeting-repository.service'; import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; @@ -7,14 +7,10 @@ import { ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models' import { ViewProjector } from '../../../../projectors'; import { ProjectorControllerService } from '../../../../projectors/services/projector-controller.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class CurrentListOfSpeakersSlideService { - public constructor( - private projectorService: ProjectorControllerService, - private activeMeetingIdService: ActiveMeetingIdService - ) {} + private projectorService = inject(ProjectorControllerService); + private activeMeetingIdService = inject(ActiveMeetingIdService); /** * @returns the slide build descriptor for the overlay or slide diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers.service.ts index a204c9cf70..61396bf7d5 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-list-of-speakers.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; import { ViewProjector } from '../../../../projectors'; @@ -10,9 +10,7 @@ import { ListOfSpeakersControllerService } from './list-of-speakers-controller.s * Observes the projector config for a given projector and returns a observable of the * current view list of speakers displayed on the projector. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class CurrentListOfSpeakersService { /** * Current clos reference projector @@ -39,10 +37,10 @@ export class CurrentListOfSpeakersService { public currentListOfSpeakersObservable = this.currentListOfSpeakerSubject as Observable; - public constructor( - private projectorRepo: ProjectorControllerService, - private listOfSpeakersRepo: ListOfSpeakersControllerService - ) { + private projectorRepo = inject(ProjectorControllerService); + private listOfSpeakersRepo = inject(ListOfSpeakersControllerService); + + public constructor() { // Watch for changes and update the current list of speakers for every projector. this.projectorRepo.getGeneralViewModelObservable().subscribe(projector => { if (projector) { diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-speaking-structure-level-slide.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-speaking-structure-level-slide.service.ts index 5770c99a5f..7dc5116f94 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-speaking-structure-level-slide.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-speaking-structure-level-slide.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { PROJECTIONDEFAULT } from '@app/domain/models/projector/projection-default'; import { MeetingProjectionType } from '@app/gateways/repositories/meeting-repository.service'; import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; @@ -7,14 +7,10 @@ import { ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models' import { ViewProjector } from '../../../../projectors'; import { ProjectorControllerService } from '../../../../projectors/services/projector-controller.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class CurrentSpeakingStructureLevelSlideService { - public constructor( - private projectorService: ProjectorControllerService, - private activeMeetingIdService: ActiveMeetingIdService - ) {} + private projectorService = inject(ProjectorControllerService); + private activeMeetingIdService = inject(ActiveMeetingIdService); /** * @returns the slide build descriptor for the overlay or slide diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-structure-level-list-slide.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-structure-level-list-slide.service.ts index 690e7cc2b4..76abbedf60 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-structure-level-list-slide.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/current-structure-level-list-slide.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { PROJECTIONDEFAULT } from '@app/domain/models/projector/projection-default'; import { MeetingProjectionType } from '@app/gateways/repositories/meeting-repository.service'; import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; @@ -7,14 +7,10 @@ import { ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models' import { ViewProjector } from '../../../../projectors'; import { ProjectorControllerService } from '../../../../projectors/services/projector-controller.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class CurrentStructureLevelListSlideService { - public constructor( - private projectorService: ProjectorControllerService, - private activeMeetingIdService: ActiveMeetingIdService - ) {} + private projectorService = inject(ProjectorControllerService); + private activeMeetingIdService = inject(ActiveMeetingIdService); /** * @returns the slide build descriptor for the overlay or slide diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service.ts index e8bd236063..0906fac7bb 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/list-of-speakers-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { ListOfSpeakers } from '@app/domain/models/list-of-speakers/list-of-speakers'; import { ListOfSpeakersRepositoryService } from '@app/gateways/repositories/list-of-speakers/list-of-speakers-repository.service'; @@ -21,15 +21,14 @@ export interface SpeakingTimeStructureLevelObject { name: string; } -@Injectable({ - providedIn: `root` -}) +@Service() export class ListOfSpeakersControllerService extends BaseController { - public constructor( - controllerServiceCollector: ControllerServiceCollectorService, - protected override repo: ListOfSpeakersRepositoryService, - private meetingSettings: MeetingSettingsService - ) { + protected override repo: ListOfSpeakersRepositoryService; + private meetingSettings = inject(MeetingSettingsService); + + public constructor() { + const controllerServiceCollector = inject(ControllerServiceCollectorService); + const repo = inject(ListOfSpeakersRepositoryService); super(controllerServiceCollector, ListOfSpeakers, repo); } diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/point-of-order-category-controller.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/point-of-order-category-controller.service.ts index f4fa7c4c70..44b803733e 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/point-of-order-category-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/point-of-order-category-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { PointOfOrderCategory } from '@app/domain/models/point-of-order-category/point-of-order-category'; import { PointOfOrderCategoryRepositoryService } from '@app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service'; import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; @@ -6,17 +6,16 @@ import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetin import { ViewPointOfOrderCategory } from '../view-models/view-point-of-order-category'; -@Injectable({ - providedIn: `root` -}) +@Service() export class PointOfOrderCategoryControllerService extends BaseMeetingControllerService< ViewPointOfOrderCategory, PointOfOrderCategory > { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: PointOfOrderCategoryRepositoryService - ) { + protected override repo: PointOfOrderCategoryRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(PointOfOrderCategoryRepositoryService); super(controllerServiceCollector, PointOfOrderCategory, repo); } } diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service.ts index 959cbe441f..9d9592f411 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/list-of-speakers/services/speaker-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id, UnsafeHtml } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Speaker } from '@app/domain/models/speakers/speaker'; @@ -14,15 +14,14 @@ import { map, Observable } from 'rxjs'; import { MeetingControllerServiceCollectorService } from '../../../../../services/meeting-controller-service-collector.service'; import { ViewListOfSpeakers, ViewSpeaker } from '../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class SpeakerControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: SpeakerRepositoryService, - protected userRepo: UserControllerService - ) { + protected userRepo = inject(UserControllerService); + protected override repo: SpeakerRepositoryService; + + public constructor() { + const repo = inject(SpeakerRepositoryService); + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); super(controllerServiceCollector, Speaker, repo); } diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-dialog.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-dialog.service.ts index 9726d89d9f..5aeb33bdb3 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { BasePollDialogService } from '@app/site/pages/meetings/modules/poll/base/base-poll-dialog.service'; import { ViewTopic } from '../../../view-models'; @@ -7,9 +7,7 @@ import { TopicPollDialogComponent } from '../components/topic-poll-dialog/topic- /** * Subclassed to provide the right `PollService` and `DialogComponent` */ -@Injectable({ - providedIn: 'root' -}) +@Service() export class TopicPollDialogService extends BasePollDialogService { protected getComponent(): typeof TopicPollDialogComponent { return TopicPollDialogComponent; diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-pdf.service/topic-poll-pdf.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-pdf.service/topic-poll-pdf.service.ts index c4f9ea9b0f..13f86ae9ef 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-pdf.service/topic-poll-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll-pdf.service/topic-poll-pdf.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { AbstractPollData, BasePollPdfService } from '@app/site/pages/meetings/modules/poll/base/base-poll-pdf.service'; import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; import { TranslateService } from '@ngx-translate/core'; @@ -7,15 +7,13 @@ import { TopicControllerService } from '../../../../services/topic-controller.se import { ViewTopic } from '../../../../view-models'; import { TopicPollService } from '../topic-poll.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class TopicPollPdfService extends BasePollPdfService { - public constructor( - protected override translate: TranslateService, - private topicRepo: TopicControllerService, - pollService: TopicPollService - ) { + protected override translate = inject(TranslateService); + private topicRepo = inject(TopicControllerService); + + public constructor() { + const pollService = inject(TopicPollService); super(pollService); this.meetingSettingsService .get(`motion_poll_ballot_paper_number`) diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts index f1cb179740..0a4af5d6b9 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ABSTAIN_KEY, CalculablePollKey, @@ -31,20 +31,18 @@ interface TopicPollTableEntry { data: number | undefined; } -@Injectable({ - providedIn: 'root' -}) +@Service() export class TopicPollService extends PollService { public defaultPollMethod: PollMethod; public defaultPercentBase: PollPercentBase; public defaultGroupIds: number[]; - public constructor( - pollServiceMapper: PollServiceMapperService, - private pollRepo: PollControllerService, - private meetingSettingsService: MeetingSettingsService - ) { + private pollRepo = inject(PollControllerService); + private meetingSettingsService = inject(MeetingSettingsService); + + public constructor() { super(); + const pollServiceMapper = inject(PollServiceMapperService); pollServiceMapper.registerService(ViewTopic.COLLECTION, this); this.meetingSettingsService .get(`poll_default_onehundred_percent_base`) diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-export.service/topic-export.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-export.service/topic-export.service.ts index ea3dc7f1bd..caa86ed035 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-export.service/topic-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-export.service/topic-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { CsvExportForBackendService } from '@app/gateways/export/csv-export.service/csv-export-for-backend.service'; import { TranslateService } from '@ngx-translate/core'; @@ -12,14 +12,10 @@ interface TopicExport { agenda_type?: string; } -@Injectable({ - providedIn: 'root' -}) +@Service() export class TopicExportService { - public constructor( - private csvExportService: CsvExportForBackendService, - private translate: TranslateService - ) {} + private csvExportService = inject(CsvExportForBackendService); + private translate = inject(TranslateService); public downloadCsvImportExample(): void { const rows: TopicExport[] = [ diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-import.service/topic-import.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-import.service/topic-import.service.ts index 7ad7ceab51..99baf4ee05 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-import.service/topic-import.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-import/services/topic-import.service/topic-import.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { AgendaItemType } from '@app/domain/models/agenda/agenda-item'; import { TopicRepositoryService } from '@app/gateways/repositories/topics/topic-repository.service'; import { BaseBackendImportService } from '@app/site/base/base-import.service/base-backend-import.service'; @@ -9,9 +9,7 @@ import { _ } from '@ngx-translate/core'; import { TopicExportService } from '../topic-export.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class TopicImportService extends BaseBackendImportService { /** * The minimimal number of header entries needed to successfully create an entry @@ -34,18 +32,12 @@ export class TopicImportService extends BaseBackendImportService { warning: _(`Topics with warnings (will be skipped)`) }; - /** - * Constructor. Calls the abstract class and sets the expected header - * - * @param durationService: a service for converting time strings and numbers - * @param repo: The Agenda repository service - */ - public constructor( - serviceCollector: ImportServiceCollectorService, - private repo: TopicRepositoryService, - private exporter: TopicExportService, - private activeMeetingId: ActiveMeetingIdService - ) { + private repo = inject(TopicRepositoryService); + private exporter = inject(TopicExportService); + private activeMeetingId = inject(ActiveMeetingIdService); + + public constructor() { + const serviceCollector = inject(ImportServiceCollectorService); super(serviceCollector); } diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-controller.service/topic-controller.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-controller.service/topic-controller.service.ts index d9efdca510..531df69842 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-controller.service/topic-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-controller.service/topic-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { Topic } from '@app/domain/models/topics/topic'; import { TopicRepositoryService } from '@app/gateways/repositories/topics/topic-repository.service'; @@ -8,14 +8,13 @@ import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetin import { ViewTopic } from '../../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class TopicControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: TopicRepositoryService - ) { + protected override repo: TopicRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(TopicRepositoryService); super(controllerServiceCollector, Topic, repo); } diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-pdf.service/topic-pdf.service.ts b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-pdf.service/topic-pdf.service.ts index 4b54aabe3a..17dac3bdc4 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-pdf.service/topic-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/services/topic-pdf.service/topic-pdf.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { PollMethod, PollTableData, VotingResult } from '@app/domain/models/poll'; import { HtmlToPdfService } from '@app/gateways/export/html-to-pdf.service'; import { MeetingPdfExportService } from '@app/site/pages/meetings/services/export'; @@ -12,14 +12,12 @@ import { ViewTopic } from '../../view-models'; /** * Creates a PDF document from a single tpoic */ -@Injectable({ providedIn: 'root' }) +@Service() export class TopicPdfService { - public constructor( - private translate: TranslateService, - private htmlToPdfService: HtmlToPdfService, - private pdfDocumentService: MeetingPdfExportService, - private pollService: TopicPollService - ) {} + private translate = inject(TranslateService); + private htmlToPdfService = inject(HtmlToPdfService); + private pdfDocumentService = inject(MeetingPdfExportService); + private pollService = inject(TopicPollService); /** * Generates an pdf out of a given topic and saves it as file diff --git a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-export.service/agenda-item-export.service.ts b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-export.service/agenda-item-export.service.ts index dee6d9f661..37f8f87f34 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-export.service/agenda-item-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-export.service/agenda-item-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ViewAgendaItem } from '@app/site/pages/meetings/pages/agenda'; import { MeetingPdfExportService } from '@app/site/pages/meetings/services/export'; import { MeetingCsvExportForBackendService } from '@app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service'; @@ -25,16 +25,12 @@ export type pdfMetaInfo = `table_of_content` | `line_break` | `header` | `footer export type csvMetaInfo = `duration` | `tags` | `agenda_visibility` | `done`; -@Injectable({ - providedIn: 'root' -}) +@Service() export class AgendaItemExportService { - public constructor( - private translate: TranslateService, - private csvExportService: MeetingCsvExportForBackendService, - private pdfExportService: MeetingPdfExportService, - private agendaPdfExportService: AgendaPdfCatalogExportService - ) {} + private translate = inject(TranslateService); + private csvExportService = inject(MeetingCsvExportForBackendService); + private pdfExportService = inject(MeetingPdfExportService); + private agendaPdfExportService = inject(AgendaPdfCatalogExportService); public exportAsCsv(source: ViewAgendaItem[], info: InfoToExport[], csvMeta: csvMetaInfo): void { const config = []; diff --git a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-filter.service/agenda-item-filter.service.ts b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-filter.service/agenda-item-filter.service.ts index 3b8dcd8f70..ab74dcb307 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-filter.service/agenda-item-filter.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/services/agenda-item-filter.service/agenda-item-filter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ItemTypeChoices } from '@app/domain/models/agenda/agenda-item'; import { Assignment } from '@app/domain/models/assignments/assignment'; import { Motion } from '@app/domain/models/motions/motion'; @@ -8,13 +8,10 @@ import { BaseFilterListService, OsFilter, OsFilterOption } from '@app/site/base/ import { ViewAgendaItem } from '@app/site/pages/meetings/pages/agenda/view-models'; import { ActiveFiltersService } from '@app/site/services/active-filters.service'; import { _ } from '@ngx-translate/core'; -import { TranslateService } from '@ngx-translate/core'; import { TagControllerService } from '../../../../../motions/modules/tags/services/tag-controller.service/tag-controller.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class AgendaItemFilterService extends BaseFilterListService { /** * set the storage key name @@ -29,15 +26,10 @@ export class AgendaItemFilterService extends BaseFilterListService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: AgendaItemRepositoryService - ) { + protected override repo: AgendaItemRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(AgendaItemRepositoryService); super(controllerServiceCollector, AgendaItem, repo); } diff --git a/client/src/app/site/pages/meetings/pages/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.ts b/client/src/app/site/pages/meetings/pages/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.ts index fe06676147..8d21d18658 100644 --- a/client/src/app/site/pages/meetings/pages/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/agenda/services/agenda-pdf-catalog-export.service/agenda-pdf-catalog-export.service.ts @@ -1,5 +1,5 @@ import { Location } from '@angular/common'; -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { BorderType, PdfError, StyleType } from '@app/gateways/export/pdf-document.service'; import { PdfImagesService } from '@app/gateways/export/pdf-document.service/pdf-images.service'; import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; @@ -27,24 +27,20 @@ const AGENDA_PDF_OPTIONS = { Footer: `footer` }; -@Injectable({ - providedIn: 'root' -}) +@Service() export class AgendaPdfCatalogExportService { // parent agenda items which are not in the export are handled different // then exported agenda items, collect the ids of the special parent items here private addedAgendaItemIds = []; - public constructor( - private translate: TranslateService, - private pdfService: MeetingPdfExportService, - private htmlToPdfService: MotionHtmlToPdfService, - private organizationSettingsService: OrganizationSettingsService, - private meetingSettingsService: MeetingSettingsService, - private pdfImagesService: PdfImagesService, - private durationService: DurationService, - private treeService: TreeService - ) {} + private translate = inject(TranslateService); + private pdfService = inject(MeetingPdfExportService); + private htmlToPdfService = inject(MotionHtmlToPdfService); + private organizationSettingsService = inject(OrganizationSettingsService); + private meetingSettingsService = inject(MeetingSettingsService); + private pdfImagesService = inject(PdfImagesService); + private durationService = inject(DurationService); + private treeService = inject(TreeService); /** * Converts the list of agenda items to pdfmake doc definition. diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-dialog.service.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-dialog.service.ts index bc7963d0e0..b1d0ecbc43 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-dialog.service.ts @@ -1,12 +1,10 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { BasePollDialogService } from '@app/site/pages/meetings/modules/poll/base/base-poll-dialog.service'; import { ViewAssignment } from '@app/site/pages/meetings/pages/assignments'; import { AssignmentPollDialogComponent } from '../components/assignment-poll-dialog/assignment-poll-dialog.component'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class AssignmentPollDialogService extends BasePollDialogService { protected getComponent(): typeof AssignmentPollDialogComponent { return AssignmentPollDialogComponent; diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-pdf.service/assignment-poll-pdf.service.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-pdf.service/assignment-poll-pdf.service.ts index 321b166b7f..50156b6191 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-pdf.service/assignment-poll-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll-pdf.service/assignment-poll-pdf.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { PollMethod } from '@app/domain/models/poll/poll-constants'; import { AbstractPollData, BasePollPdfService } from '@app/site/pages/meetings/modules/poll/base/base-poll-pdf.service'; import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; @@ -9,16 +9,14 @@ import { AssignmentControllerService } from '../../../../services/assignment-con import { ViewAssignment } from '../../../../view-models'; import { AssignmentPollService } from '../assignment-poll.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class AssignmentPollPdfService extends BasePollPdfService { - public constructor( - meetingSettingsService: MeetingSettingsService, - protected override translate: TranslateService, - private assignmentRepo: AssignmentControllerService, - pollService: AssignmentPollService - ) { + protected override translate = inject(TranslateService); + private assignmentRepo = inject(AssignmentControllerService); + + public constructor() { + const meetingSettingsService = inject(MeetingSettingsService); + const pollService = inject(AssignmentPollService); super(pollService); meetingSettingsService .get(`assignment_poll_ballot_paper_number`) diff --git a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts index 569f256941..ae71d65b25 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Assignment } from '@app/domain/models/assignments/assignment'; import { PollPercentBaseVerboseKey, PollTypeVerboseKey } from '@app/domain/models/poll'; import { OptionData, PollData } from '@app/domain/models/poll/generic-poll'; @@ -29,20 +29,20 @@ export const UnknownUserLabel = _(`Deleted user`); * perfectly fits on assignments. Motion polls are now the special case; assignment polls should * be the default case. */ -@Injectable({ providedIn: 'root' }) +@Service() export class AssignmentPollService extends PollService { public defaultPollMethod: PollMethod | undefined; public defaultPercentBase: PollPercentBase | undefined; public defaultPollType: PollType | undefined; public defaultGroupIds: number[] = []; - public constructor( - pollServiceMapper: PollServiceMapperService, - protected override translate: TranslateService, - private pollRepo: PollControllerService, - private meetingSettingsService: MeetingSettingsService - ) { + protected override translate = inject(TranslateService); + private pollRepo = inject(PollControllerService); + private meetingSettingsService = inject(MeetingSettingsService); + + public constructor() { super(); + const pollServiceMapper = inject(PollServiceMapperService); pollServiceMapper.registerService(ViewAssignment.COLLECTION, this); this.meetingSettingsService .get(`assignment_poll_default_onehundred_percent_base`) diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/services/assignment-candidate-controller.service.ts b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/services/assignment-candidate-controller.service.ts index b50a6006fd..256e9ef66c 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/services/assignment-candidate-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/services/assignment-candidate-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { AssignmentCandidate } from '@app/domain/models/assignments/assignment-candidate'; @@ -8,15 +8,16 @@ import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base import { ViewAssignmentCandidate } from '@app/site/pages/meetings/pages/assignments'; import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; -@Injectable({ providedIn: 'root' }) +@Service() export class AssignmentCandidateControllerService extends BaseMeetingControllerService< ViewAssignmentCandidate, AssignmentCandidate > { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: AssignmentCandidateRepositoryService - ) { + protected override repo: AssignmentCandidateRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(AssignmentCandidateRepositoryService); super(controllerServiceCollector, AssignmentCandidate, repo); } diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-filter-list.service.ts b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-filter-list.service.ts index 3a83a6023d..debb9b1b0b 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-filter-list.service.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-filter-list.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { BaseFilterListService, OsFilter, OsFilterOption } from '@app/site/base/base-filter.service'; import { ActiveFiltersService } from '@app/site/services/active-filters.service'; @@ -8,16 +8,15 @@ import { ViewAssignment } from '../../../view-models'; /** * Filter service for the assignment list */ -@Injectable({ - providedIn: 'root' -}) +@Service() export class AssignmentFilterListService extends BaseFilterListService { /** * set the storage key name */ protected storageKey = `AssignmentList`; - public constructor(store: ActiveFiltersService) { + public constructor() { + const store = inject(ActiveFiltersService); super(store); } diff --git a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-sort-list.service.ts b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-sort-list.service.ts index ddff3e1614..1c4d629a0d 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-sort-list.service.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/pages/assignment-list/services/assignment-sort-list.service.ts @@ -1,4 +1,4 @@ -import { Injectable, ProviderToken } from '@angular/core'; +import { ProviderToken, Service } from '@angular/core'; import { AssignmentRepositoryService } from '@app/gateways/repositories/assignments/assignment-repository.service'; import { BaseRepository } from '@app/gateways/repositories/base-repository'; import { BaseSortListService, OsSortingOption } from '@app/site/base/base-sort.service'; @@ -7,9 +7,7 @@ import { ViewAssignment } from '@app/site/pages/meetings/pages/assignments'; /** * Sorting service for the assignment list */ -@Injectable({ - providedIn: `root` -}) +@Service() export class AssignmentSortListService extends BaseSortListService { /** * set the storage key name diff --git a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-controller.service.ts b/client/src/app/site/pages/meetings/pages/assignments/services/assignment-controller.service.ts index b1bcf26a24..e03730f253 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/services/assignment-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Assignment } from '@app/domain/models/assignments/assignment'; import { AssignmentRepositoryService } from '@app/gateways/repositories/assignments/assignment-repository.service'; import { CreateResponse } from '@app/gateways/repositories/base-repository'; @@ -6,12 +6,13 @@ import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base import { ViewAssignment } from '@app/site/pages/meetings/pages/assignments'; import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; -@Injectable({ providedIn: 'root' }) +@Service() export class AssignmentControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: AssignmentRepositoryService - ) { + protected override repo: AssignmentRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(AssignmentRepositoryService); super(controllerServiceCollector, Assignment, repo); } diff --git a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-export.service.ts b/client/src/app/site/pages/meetings/pages/assignments/services/assignment-export.service.ts index 20c06429cf..ee3216e0cf 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/services/assignment-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { PdfError } from '@app/gateways/export/pdf-document.service'; import { MeetingPdfExportService } from '@app/site/pages/meetings/services/export'; import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; @@ -11,14 +11,12 @@ import { AssignmentPdfService } from './assignment-pdf.service'; /** * Controls PDF export for assignments */ -@Injectable({ providedIn: 'root' }) +@Service() export class AssignmentExportService { - public constructor( - private translate: TranslateService, - private assignmentPdfService: AssignmentPdfService, - private pdfDocumentService: MeetingPdfExportService, - private meetingSettingsService: MeetingSettingsService - ) {} + private translate = inject(TranslateService); + private assignmentPdfService = inject(AssignmentPdfService); + private pdfDocumentService = inject(MeetingPdfExportService); + private meetingSettingsService = inject(MeetingSettingsService); /** * Generates an pdf out of a given assignment and saves it as file diff --git a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-pdf.service.ts b/client/src/app/site/pages/meetings/pages/assignments/services/assignment-pdf.service.ts index a313078d9e..0a71d38714 100644 --- a/client/src/app/site/pages/meetings/pages/assignments/services/assignment-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/assignments/services/assignment-pdf.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { AssignmentPhase } from '@app/domain/models/assignments/assignment-phase'; import { PollMethod, PollTableData, VotingResult } from '@app/domain/models/poll/poll-constants'; import { HtmlToPdfService } from '@app/gateways/export/html-to-pdf.service'; @@ -12,13 +12,11 @@ import { ViewAssignment } from '../view-models'; /** * Creates a PDF document from a single assignment */ -@Injectable({ providedIn: 'root' }) +@Service() export class AssignmentPdfService { - public constructor( - private translate: TranslateService, - private htmlToPdfService: HtmlToPdfService, - private assignmentPollService: AssignmentPollService - ) {} + private translate = inject(TranslateService); + private htmlToPdfService = inject(HtmlToPdfService); + private assignmentPollService = inject(AssignmentPollService); /** * Main function to control the pdf generation. diff --git a/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/services/chat-group-dialog.service.ts b/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/services/chat-group-dialog.service.ts index 6874201206..84d9d3b93f 100644 --- a/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/services/chat-group-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/chat/modules/chat-group-dialog/services/chat-group-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { Ids } from '@app/domain/definitions/key-types'; import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; @@ -18,9 +18,7 @@ interface ChatGroupDialogResult { write_group_ids: Ids; } -@Injectable({ - providedIn: 'root' -}) +@Service() export class ChatGroupDialogService extends BaseDialogService< ChatGroupDialogComponent, ChatGroupDialogData, diff --git a/client/src/app/site/pages/meetings/pages/chat/services/chat-group-controller.service.ts b/client/src/app/site/pages/meetings/pages/chat/services/chat-group-controller.service.ts index c44b492668..31d6f36e25 100644 --- a/client/src/app/site/pages/meetings/pages/chat/services/chat-group-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/chat/services/chat-group-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { ChatGroup } from '@app/domain/models/chat/chat-group'; import { ChatGroupRepositoryService } from '@app/gateways/repositories/chat/chat-group-repository.service'; @@ -7,14 +7,13 @@ import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetin import { ViewChatGroup } from '../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ChatGroupControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: ChatGroupRepositoryService - ) { + protected override repo: ChatGroupRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(ChatGroupRepositoryService); super(controllerServiceCollector, ChatGroup, repo); } diff --git a/client/src/app/site/pages/meetings/pages/chat/services/chat-message-controller.service.ts b/client/src/app/site/pages/meetings/pages/chat/services/chat-message-controller.service.ts index 5d8bbbf488..a44ceac0a6 100644 --- a/client/src/app/site/pages/meetings/pages/chat/services/chat-message-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/chat/services/chat-message-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { ChatMessage } from '@app/domain/models/chat/chat-message'; import { ChatMessageRepositoryService } from '@app/gateways/repositories/chat/chat-message-repository.service'; @@ -7,14 +7,13 @@ import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetin import { ViewChatMessage } from '../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ChatMessageControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: ChatMessageRepositoryService - ) { + protected override repo: ChatMessageRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(ChatMessageRepositoryService); super(controllerServiceCollector, ChatMessage, repo); } diff --git a/client/src/app/site/pages/meetings/pages/chat/services/chat-notification.service.ts b/client/src/app/site/pages/meetings/pages/chat/services/chat-notification.service.ts index 8a6ecb5678..305fc2b211 100644 --- a/client/src/app/site/pages/meetings/pages/chat/services/chat-notification.service.ts +++ b/client/src/app/site/pages/meetings/pages/chat/services/chat-notification.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { StorageService } from '@app/gateways/storage.service'; import { BehaviorSubject, Observable } from 'rxjs'; @@ -22,9 +22,7 @@ type LastSeenTimestampEvent = Record; const STORAGE_KEY = `os4-chat-notifications`; -@Injectable({ - providedIn: `root` -}) +@Service() export class ChatNotificationService { public get allChatGroupsNotificationsObservable(): Observable { return this._allGroupsNotificationsSubject; @@ -37,11 +35,11 @@ export class ChatNotificationService { private _lastMessageAmount = 0; private _chatMessages: ViewChatMessage[] = []; - public constructor( - private storage: StorageService, - private chatMessageRepo: ChatMessageControllerService - ) { - storage.addNoClearKey(STORAGE_KEY); + private storage = inject(StorageService); + private chatMessageRepo = inject(ChatMessageControllerService); + + public constructor() { + this.storage.addNoClearKey(STORAGE_KEY); this.setup(); } diff --git a/client/src/app/site/pages/meetings/pages/chat/services/chat.service.ts b/client/src/app/site/pages/meetings/pages/chat/services/chat.service.ts index f5ebce2d28..6bfdfd3a9a 100644 --- a/client/src/app/site/pages/meetings/pages/chat/services/chat.service.ts +++ b/client/src/app/site/pages/meetings/pages/chat/services/chat.service.ts @@ -1,15 +1,12 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Permission } from '@app/domain/definitions/permission'; -import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; import { OperatorService } from '@app/site/services/operator.service'; import { BehaviorSubject, Observable } from 'rxjs'; import { ChatGroupControllerService } from './chat-group-controller.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ChatService { public get canSeeChatObservable(): Observable { return this._canSeeChatSubject; @@ -20,12 +17,10 @@ export class ChatService { private _canManage = false; private _isChatEnabled = false; - public constructor( - _chatGroupRepo: ChatGroupControllerService, - _operator: OperatorService, - _meetingSettingService: MeetingSettingsService, - _orgaSettingService: OrganizationSettingsService - ) { + public constructor() { + const _chatGroupRepo = inject(ChatGroupControllerService); + const _operator = inject(OperatorService); + const _orgaSettingService = inject(OrganizationSettingsService); this._canSeeSomeChatGroup = _chatGroupRepo.getViewModelList()?.length > 0; this._canManage = _operator.hasPerms(Permission.chatCanManage); this._isChatEnabled = _orgaSettingService.instant(`enable_chat`); diff --git a/client/src/app/site/pages/meetings/pages/home/pages/meeting-info/services/count-users-statistics.service.ts b/client/src/app/site/pages/meetings/pages/home/pages/meeting-info/services/count-users-statistics.service.ts index 189aa14180..080deb69d2 100644 --- a/client/src/app/site/pages/meetings/pages/home/pages/meeting-info/services/count-users-statistics.service.ts +++ b/client/src/app/site/pages/meetings/pages/home/pages/meeting-info/services/count-users-statistics.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { HttpService } from '@app/gateways/http.service'; import { UserRepositoryService } from '@app/gateways/repositories/users'; import { AUTOUPDATE_DEFAULT_ENDPOINT } from '@app/site/services/autoupdate'; @@ -22,9 +22,7 @@ export interface CountUserStatistics { const CONNECTION_COUNT_PATH = `/system/${AUTOUPDATE_DEFAULT_ENDPOINT}/connection_count`; -@Injectable({ - providedIn: `root` -}) +@Service() export class CountUsersStatisticsService { public get lastUpdated(): number { return this._lastUpdated; @@ -32,10 +30,8 @@ export class CountUsersStatisticsService { private _lastUpdated: number; - public constructor( - private http: HttpService, - private userRepo: UserRepositoryService - ) {} + private http = inject(HttpService); + private userRepo = inject(UserRepositoryService); /** * Starts counting users. diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/applause.service.ts b/client/src/app/site/pages/meetings/pages/interaction/services/applause.service.ts index fe433ac884..49d9d434c5 100644 --- a/client/src/app/site/pages/meetings/pages/interaction/services/applause.service.ts +++ b/client/src/app/site/pages/meetings/pages/interaction/services/applause.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { ApplauseType } from '@app/domain/models/meetings/applause'; import { BaseICCGatewayService } from '@app/gateways/base-icc-gateway.service'; @@ -11,9 +11,7 @@ export interface Applause { present_users: number; } -@Injectable({ - providedIn: 'root' -}) +@Service() export class ApplauseService extends BaseICCGatewayService { public get showParticles(): Observable { return this.applauseTypeObservable.pipe(map(type => type === ApplauseType.particles)); @@ -62,13 +60,13 @@ export class ApplauseService extends BaseICCGatewayService { return this.activeMeetingService.meetingId!; } - public constructor( - settingService: MeetingSettingsService, - private activeMeetingService: ActiveMeetingService - ) { + private activeMeetingService = inject(ActiveMeetingService); + + public constructor() { super(); this.setupConnections(); + const settingService = inject(MeetingSettingsService); this.showApplauseObservable = settingService.get(`applause_enable`); this.applauseTypeObservable = settingService.get(`applause_type`); this.showApplauseLevelConfigObservable = settingService.get(`applause_show_level`); diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/broadcast.service.ts b/client/src/app/site/pages/meetings/pages/interaction/services/broadcast.service.ts index 8e38237efc..308110ad10 100644 --- a/client/src/app/site/pages/meetings/pages/interaction/services/broadcast.service.ts +++ b/client/src/app/site/pages/meetings/pages/interaction/services/broadcast.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { Observable, Subject } from 'rxjs'; import { filter } from 'rxjs/operators'; @@ -15,9 +15,7 @@ export interface BroadcastMessage { const BroadcastChannelName = `OpenSlidesBrowserBroadcast`; -@Injectable({ - providedIn: 'root' -}) +@Service() export class BroadcastService { private broadcastChannel: BroadcastChannel; private onMessage = new Subject(); diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/call-restriction.service.ts b/client/src/app/site/pages/meetings/pages/interaction/services/call-restriction.service.ts index e12cec0b4b..970f96c71b 100644 --- a/client/src/app/site/pages/meetings/pages/interaction/services/call-restriction.service.ts +++ b/client/src/app/site/pages/meetings/pages/interaction/services/call-restriction.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Permission } from '@app/domain/definitions/permission'; import { OperatorService } from '@app/site/services/operator.service'; import { StorageMap } from '@ngx-pwa/local-storage'; @@ -9,10 +9,13 @@ import { SpeakerStateOnList } from '../../agenda'; import { CurrentListOfSpeakersService } from '../../agenda/modules/list-of-speakers/services/current-list-of-speakers.service'; import { RTC_LOGGED_STORAGE_KEY } from './rtc.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class CallRestrictionService { + private settingService = inject(MeetingSettingsService); + private operator = inject(OperatorService); + private closService = inject(CurrentListOfSpeakersService); + private storageMap = inject(StorageMap); + public isAccessRestricted: Observable = this.settingService.get(`conference_los_restriction`); public isJitsiActiveInAnotherTab: Observable = this.storageMap .watch(RTC_LOGGED_STORAGE_KEY, { type: `boolean` }) @@ -36,17 +39,12 @@ export class CallRestrictionService { private canEnterCallSubject = new BehaviorSubject(false); public canEnterCallObservable = this.canEnterCallSubject as Observable; - public constructor( - private settingService: MeetingSettingsService, - private operator: OperatorService, - private closService: CurrentListOfSpeakersService, - private storageMap: StorageMap - ) { + public constructor() { combineLatest([ this.isAccessRestricted, this.userClosPosition, this.amountNextSpeakerAutoConnect, - operator.userObservable, + this.operator.userObservable, this.isJitsiActiveInAnotherTab ]) .pipe( diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/interaction-receive.service.ts b/client/src/app/site/pages/meetings/pages/interaction/services/interaction-receive.service.ts index 0b09d5ca07..11f82212bc 100644 --- a/client/src/app/site/pages/meetings/pages/interaction/services/interaction-receive.service.ts +++ b/client/src/app/site/pages/meetings/pages/interaction/services/interaction-receive.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { NotifyService } from '@app/gateways/notify.service'; import { PromptService } from '@app/ui/modules/prompt-dialog'; import { _ } from '@ngx-translate/core'; @@ -33,9 +33,7 @@ interface InteractionReceiveSetupServices { callRestrictionService: CallRestrictionService; } -@Injectable({ - providedIn: `root` -}) +@Service() export class InteractionReceiveService { private conferenceStateSubject = new BehaviorSubject(ConferenceState.none); public conferenceStateObservable = this.conferenceStateSubject as Observable; @@ -82,12 +80,10 @@ export class InteractionReceiveService { private _lazyServices: InteractionReceiveSetupServices; private _inviteSubscription: Subscription; - private _kickObservable = this.notifyService.getMessageObservable(KickMessage); + private notifyService = inject(NotifyService); + private activeMeetingService = inject(ActiveMeetingService); - public constructor( - private notifyService: NotifyService, - private activeMeetingService: ActiveMeetingService - ) {} + private _kickObservable = this.notifyService.getMessageObservable(KickMessage); public startListening(lazyServices: InteractionReceiveSetupServices): void { if (this._inviteSubscription) { diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/interaction.service.ts b/client/src/app/site/pages/meetings/pages/interaction/services/interaction.service.ts index 69bf1cd4ec..30ce96ed81 100644 --- a/client/src/app/site/pages/meetings/pages/interaction/services/interaction.service.ts +++ b/client/src/app/site/pages/meetings/pages/interaction/services/interaction.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { NotifyService } from '@app/gateways/notify.service'; import { OperatorService } from '@app/site/services/operator.service'; @@ -31,10 +31,13 @@ export interface kickMessage { export const InviteMessage = `invitationToCall`; export const KickMessage = `kickFromCall`; -@Injectable({ - providedIn: 'root' -}) +@Service() export class InteractionService { + private notifyService = inject(NotifyService); + private operator = inject(OperatorService); + private interactionReceive = inject(InteractionReceiveService); + private activeMeetingService = inject(ActiveMeetingService); + public conferenceStateObservable = this.interactionReceive.conferenceStateObservable; public get showLiveConfObservable(): Observable { @@ -61,18 +64,13 @@ export class InteractionService { return this.conferenceStateObservable.pipe(map(state => state === ConferenceState.none)); } - public constructor( - streamService: StreamService, - rtcService: RtcService, - callRestrictionService: CallRestrictionService, - private notifyService: NotifyService, - private operator: OperatorService, - promptService: PromptService, - broadcast: BroadcastService, - private interactionReceive: InteractionReceiveService, - private activeMeetingService: ActiveMeetingService - ) { - interactionReceive.startListening({ + public constructor() { + const streamService = inject(StreamService); + const rtcService = inject(RtcService); + const callRestrictionService = inject(CallRestrictionService); + const promptService = inject(PromptService); + const broadcast = inject(BroadcastService); + this.interactionReceive.startListening({ streamService, rtcService, callRestrictionService, diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/operator-media-permission.service.ts b/client/src/app/site/pages/meetings/pages/interaction/services/operator-media-permission.service.ts index 8266654345..f7de48b75a 100644 --- a/client/src/app/site/pages/meetings/pages/interaction/services/operator-media-permission.service.ts +++ b/client/src/app/site/pages/meetings/pages/interaction/services/operator-media-permission.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { SpinnerService } from '@app/site/modules/global-spinner'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; @@ -7,17 +7,13 @@ const givePermsMessage = _(`Please allow OpenSlides to access your microphone an const accessDeniedMessage = _(`Media access is denied`); const noMicMessage = _(`Your device has no microphone`); -@Injectable({ - providedIn: 'root' -}) +@Service() export class OperatorMediaPermissionService { private hasAudioDevice = false; private hasVideoDevice = false; - public constructor( - private translate: TranslateService, - private spinnerService: SpinnerService - ) {} + private translate = inject(TranslateService); + private spinnerService = inject(SpinnerService); public async requestMediaAccess(): Promise { await this.detectAvailableDevices(); diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/rtc.service.ts b/client/src/app/site/pages/meetings/pages/interaction/services/rtc.service.ts index 70c23c96d0..d3e4e74d65 100644 --- a/client/src/app/site/pages/meetings/pages/interaction/services/rtc.service.ts +++ b/client/src/app/site/pages/meetings/pages/interaction/services/rtc.service.ts @@ -1,4 +1,4 @@ -import { ElementRef, Injectable } from '@angular/core'; +import { ElementRef, inject, Service } from '@angular/core'; import { OperatorService } from '@app/site/services/operator.service'; import { StorageMap } from '@ngx-pwa/local-storage'; import { BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs'; @@ -95,10 +95,12 @@ export interface JitsiConfig { export const RTC_LOGGED_STORAGE_KEY = `rtcIsLoggedIn`; -@Injectable({ - providedIn: 'root' -}) +@Service() export class RtcService { + private userMediaPermService = inject(OperatorMediaPermissionService); + private storageMap = inject(StorageMap); + private operator = inject(OperatorService); + private jitsiConfig!: JitsiConfig; private isJitsiEnabledSubject = new BehaviorSubject(false); public isJitsiEnabledObservable = this.isJitsiEnabledSubject as Observable; @@ -154,13 +156,10 @@ export class RtcService { this.showCallDialogSubject.next(show); } - public constructor( - callRestrictionService: CallRestrictionService, - settingService: MeetingSettingsService, - private userMediaPermService: OperatorMediaPermissionService, - private storageMap: StorageMap, - private operator: OperatorService - ) { + public constructor() { + const callRestrictionService = inject(CallRestrictionService); + const settingService = inject(MeetingSettingsService); + this.isSupportEnabled = settingService.get(`conference_enable_helpdesk`); this.autoConnect = settingService.get(`conference_auto_connect`); diff --git a/client/src/app/site/pages/meetings/pages/interaction/services/stream.service.ts b/client/src/app/site/pages/meetings/pages/interaction/services/stream.service.ts index 35abbe6729..6447c9b6d0 100644 --- a/client/src/app/site/pages/meetings/pages/interaction/services/stream.service.ts +++ b/client/src/app/site/pages/meetings/pages/interaction/services/stream.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Permission } from '@app/domain/definitions/permission'; import { OperatorService } from '@app/site/services/operator.service'; import { StorageMap } from '@ngx-pwa/local-storage'; @@ -8,10 +8,11 @@ import { MeetingSettingsService } from '../../../services/meeting-settings.servi const STREAM_RUNNING_STORAGE_KEY = `streamIsRunning`; -@Injectable({ - providedIn: 'root' -}) +@Service() export class StreamService { + private storageMap = inject(StorageMap); + private settingService = inject(MeetingSettingsService); + public liveStreamUrlObservable: Observable = this.settingService.get(`conference_stream_url`); public hasLiveStreamUrlObservable: Observable = this.liveStreamUrlObservable.pipe( map(url => !!url?.trim() || false) @@ -30,11 +31,8 @@ export class StreamService { private canSeeLiveStreamSubject = new BehaviorSubject(false); public canSeeLiveStreamObservable = this.canSeeLiveStreamSubject as Observable; - public constructor( - private storageMap: StorageMap, - operator: OperatorService, - private settingService: MeetingSettingsService - ) { + public constructor() { + const operator = inject(OperatorService); this.streamLoadedOnceObservable = this.storageMap .watch(STREAM_RUNNING_STORAGE_KEY, { type: `boolean` }) .pipe(distinctUntilChanged() as any); diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service.ts index 4757ec2a91..1267ed9bd2 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-export.service/mediafile-list-export.service.ts @@ -1,17 +1,13 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { FileExportService } from '@app/gateways/export/file-export.service/file-export.service'; import { HttpService } from '@app/gateways/http.service'; import { ViewMediafile } from '@app/site/pages/meetings/pages/mediafiles'; import JSZip from 'jszip'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MediafileListExportService { - public constructor( - private exporter: FileExportService, - private http: HttpService - ) {} + private exporter = inject(FileExportService); + private http = inject(HttpService); public downloadArchive(filename: string, mediafiles: ViewMediafile[]): Promise { return this.exporter.saveFileZip(filename, async zip => await this.addFileToZip(mediafiles, zip)); diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-group.service/mediafile-list-group.service.ts b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-group.service/mediafile-list-group.service.ts index 956b1925a8..dd51639580 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-group.service/mediafile-list-group.service.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/modules/mediafile-list/services/mediafile-list-group.service/mediafile-list-group.service.ts @@ -1,12 +1,12 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { GroupRepositoryService } from '@app/gateways/repositories/groups'; import { Observable } from 'rxjs'; import { ViewGroup } from '../../../../../participants'; -@Injectable({ providedIn: 'root' }) +@Service() export class MediafileListGroupService { - public constructor(private groupRepo: GroupRepositoryService) {} + private groupRepo = inject(GroupRepositoryService); public getViewModelListObservable(): Observable { return this.groupRepo.getViewModelListObservable(); diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service.ts b/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service.ts index d715cd1abd..204c8eb71a 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-common.service.ts @@ -1,4 +1,4 @@ -import { Injectable, TemplateRef } from '@angular/core'; +import { inject, Service, TemplateRef } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { Router } from '@angular/router'; @@ -12,20 +12,18 @@ import { MediafileDeleteDialogComponent } from '../components/mediafile-delete-d import { ViewMediafile } from '../view-models'; import { MediafileControllerService } from './mediafile-controller.service'; -@Injectable({ providedIn: 'root' }) +@Service() export class MediafileCommonService { private get activeMeetingId(): number { return this.meetingIdService.meetingId!; } - public constructor( - private meetingIdService: ActiveMeetingIdService, - private router: Router, - private repo: MediafileControllerService, - private promptService: PromptService, - private translate: TranslateService, - private dialog: MatDialog - ) {} + private meetingIdService = inject(ActiveMeetingIdService); + private router = inject(Router); + private repo = inject(MediafileControllerService); + private promptService = inject(PromptService); + private translate = inject(TranslateService); + private dialog = inject(MatDialog); /** * Given a directory will navigate to the directories page, if no directory is given it will navigate to the base folder. diff --git a/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service.ts b/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service.ts index 25f7d84d61..5662e3c814 100644 --- a/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/mediafiles/services/mediafile-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Mediafile } from '@app/domain/models/mediafiles/mediafile'; @@ -13,15 +13,19 @@ import { map } from 'rxjs/operators'; import { ActiveMeetingService } from '../../../services/active-meeting.service'; import { ViewMediafile } from '../view-models'; -@Injectable({ providedIn: 'root' }) +@Service() export class MediafileControllerService extends BaseController { - public constructor( - protected override controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: MediafileRepositoryService, - private operator: OperatorService, - private activeMeeting: ActiveMeetingService - ) { + protected override controllerServiceCollector: MeetingControllerServiceCollectorService; + protected override repo: MediafileRepositoryService; + private operator = inject(OperatorService); + private activeMeeting = inject(ActiveMeetingService); + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MediafileRepositoryService); super(controllerServiceCollector, Mediafile, repo); + this.controllerServiceCollector = controllerServiceCollector; + this.repo = repo; } public move(files: Identifiable[], directoryId: Id | null): Promise { diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/services/motion-forward-dialog.service.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/services/motion-forward-dialog.service.ts index 3ba9107196..9bcec85e28 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/services/motion-forward-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-forward-dialog/services/motion-forward-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Ids } from '@app/domain/definitions/key-types'; @@ -29,9 +29,7 @@ import { MotionForwardDialogReturnData } from '../components/motion-forward-dialog/motion-forward-dialog.component'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MotionForwardDialogService extends BaseDialogService< MotionForwardDialogComponent, ViewMotion[], @@ -50,17 +48,17 @@ export class MotionForwardDialogService extends BaseDialogService< private _forwardingMeetings: GetForwardingMeetingsPresenter[] = []; private _forwardingMeetingsUpdateRequired = true; - public constructor( - private translate: TranslateService, - private repo: MotionRepositoryService, - private changeRecoRepo: MotionChangeRecommendationControllerService, - private formatService: MotionFormatService, - private snackbar: MatSnackBar, - private presenter: GetForwardingMeetingsPresenterService, - private activeMeeting: ActiveMeetingService, - private operator: OperatorService, - private modelRequest: ModelRequestService - ) { + private translate = inject(TranslateService); + private repo = inject(MotionRepositoryService); + private changeRecoRepo = inject(MotionChangeRecommendationControllerService); + private formatService = inject(MotionFormatService); + private snackbar = inject(MatSnackBar); + private presenter = inject(GetForwardingMeetingsPresenterService); + private activeMeeting = inject(ActiveMeetingService); + private operator = inject(OperatorService); + private modelRequest = inject(ModelRequestService); + + public constructor() { super(); this.activeMeeting.meetingIdObservable.subscribe(() => { diff --git a/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect.service.ts b/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect.service.ts index 1f45705408..299d2e33f2 100644 --- a/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/components/motion-multiselect/services/motion-multiselect.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Id, Ids } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; @@ -34,33 +34,28 @@ import { MotionWorkflowControllerService } from '../../../modules/workflows/serv import { MotionControllerService } from '../../../services/common/motion-controller.service'; import { ViewMotion } from '../../../view-models'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MotionMultiselectService { - private messageForSpinner = this.translate.instant(`Motions are in process. Please wait ...`); - - public constructor( - private repo: MotionControllerService, - private translate: TranslateService, - private promptService: PromptService, - private choiceService: ChoiceService, - private userRepo: ParticipantControllerService, - private workflowRepo: MotionWorkflowControllerService, - private categoryRepo: MotionCategoryControllerService, - private submitterRepo: MotionSubmitterControllerService, - private tagRepo: TagControllerService, - private personalNoteRepo: PersonalNoteControllerService, - private agendaRepo: AgendaItemControllerService, - private motionBlockRepo: MotionBlockControllerService, - private treeService: TreeService, - private spinnerService: SpinnerService, - private listOfSpeakersRepo: ListOfSpeakersControllerService, - private snackbar: MatSnackBar, - private modelRequestService: ModelRequestService, - private actionService: ActionService - ) {} + private repo = inject(MotionControllerService); + private translate = inject(TranslateService); + private promptService = inject(PromptService); + private choiceService = inject(ChoiceService); + private userRepo = inject(ParticipantControllerService); + private workflowRepo = inject(MotionWorkflowControllerService); + private categoryRepo = inject(MotionCategoryControllerService); + private submitterRepo = inject(MotionSubmitterControllerService); + private tagRepo = inject(TagControllerService); + private personalNoteRepo = inject(PersonalNoteControllerService); + private agendaRepo = inject(AgendaItemControllerService); + private motionBlockRepo = inject(MotionBlockControllerService); + private treeService = inject(TreeService); + private spinnerService = inject(SpinnerService); + private listOfSpeakersRepo = inject(ListOfSpeakersControllerService); + private snackbar = inject(MatSnackBar); + private modelRequestService = inject(ModelRequestService); + private actionService = inject(ActionService); + private messageForSpinner = this.translate.instant(`Motions are in process. Please wait ...`); /** * Deletes the given motions. Asks for confirmation. * diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/categories/services/motion-category-controller.service/motion-category-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/categories/services/motion-category-controller.service/motion-category-controller.service.ts index 1f5682c8e3..2bffdc5115 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/categories/services/motion-category-controller.service/motion-category-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/categories/services/motion-category-controller.service/motion-category-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Ids } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { MotionCategory } from '@app/domain/models/motions/motion-category'; @@ -12,21 +12,20 @@ import { BehaviorSubject, Observable } from 'rxjs'; import { ViewMotionCategory } from '../../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionCategoryControllerService extends BaseMeetingControllerService { private readonly _currentCategoriesSubject = new BehaviorSubject([]); - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: MotionCategoryRepositoryService, - private treeService: TreeService - ) { + protected override repo: MotionCategoryRepositoryService; + private treeService = inject(TreeService); + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MotionCategoryRepositoryService); super(controllerServiceCollector, MotionCategory, repo); - repo.getViewModelListObservable().subscribe(categories => - this._currentCategoriesSubject.next(this.createCategoriesTree(categories)) - ); + this.repo + .getViewModelListObservable() + .subscribe(categories => this._currentCategoriesSubject.next(this.createCategoriesTree(categories))); } public override getViewModelList(): ViewMotionCategory[] { diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/diff-factory.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/diff-factory.service.ts index 9c6f38fe8d..f680d91153 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/diff-factory.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/diff-factory.service.ts @@ -1,4 +1,4 @@ -import { ClassProvider, inject, Injectable, InjectionToken, Injector, StaticProvider, Type } from '@angular/core'; +import { ClassProvider, inject, InjectionToken, Injector, Service, StaticProvider, Type } from '@angular/core'; export const DIFF_VERSION = new InjectionToken('DIFF_VERSION'); @@ -7,9 +7,7 @@ interface DiffServiceCacheEntry { instance: T; } -@Injectable({ - providedIn: 'root' -}) +@Service() export class DiffServiceFactory { private injector = inject(Injector); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/line-numbering.service/line-numbering.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/line-numbering.service/line-numbering.service.ts index 77df0a4df6..0cfb3003eb 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/line-numbering.service/line-numbering.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/line-numbering.service/line-numbering.service.ts @@ -1,4 +1,4 @@ -import { Inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { djb2hash } from '@app/infrastructure/utils'; import { DiffCompat, LineNumbering, VERSION } from '@openslides/motion-diff'; @@ -70,9 +70,7 @@ interface InsertLineNumbersConfig { * const headings = this.lineNumbering.getHeadingsWithLineNumbers(html); * ``` */ -@Injectable({ - providedIn: `root` -}) +@Service() export class LineNumberingService { private ln: typeof LineNumbering; @@ -84,7 +82,8 @@ export class LineNumberingService { */ private lineNumberCache = new DiffCache(); - public constructor(@Inject(DIFF_VERSION) diffVersion: string) { + public constructor() { + const diffVersion = inject(DIFF_VERSION); if (diffVersion === VERSION) { this.ln = LineNumbering; } else { diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service.ts index d89a27907d..a036d10d0d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-change-recommendation-controller.service/motion-change-recommendation-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { MotionChangeRecommendation } from '@app/domain/models/motions/motion-change-recommendation'; @@ -16,18 +16,17 @@ import { ViewMotionChangeRecommendation, ViewUnifiedChange } from '../../view-mo import { DiffServiceFactory } from '../diff-factory.service'; import { MotionDiffService } from '../motion-diff.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionChangeRecommendationControllerService extends BaseMeetingControllerService< ViewMotionChangeRecommendation, MotionChangeRecommendation > { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: MotionChangeRecommendationRepositoryService, - private diffServiceFactory: DiffServiceFactory - ) { + protected override repo: MotionChangeRecommendationRepositoryService; + private diffServiceFactory = inject(DiffServiceFactory); + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MotionChangeRecommendationRepositoryService); super(controllerServiceCollector, MotionChangeRecommendation, repo); } diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.ts index 018865a12d..bb70ab8bd9 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/change-recommendations/services/motion-diff.service/motion-diff.service.ts @@ -1,4 +1,4 @@ -import { Inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { djb2hash } from '@app/infrastructure/utils'; import { replaceHtmlEntities } from '@app/infrastructure/utils/dom-helpers'; import { TranslateService } from '@ngx-translate/core'; @@ -73,17 +73,15 @@ import { LineNumberedString } from '../line-numbering.service'; * const merged = this.diffService.replaceLines(lineNumberedText, '

Replaced paragraph

', 1, 1); * ``` */ -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionDiffService { private diffCache = new DiffCache(); private htmlDiff: typeof HtmlDiff; - public constructor( - @Inject(DIFF_VERSION) diffVersion: string, - private translate: TranslateService - ) { + private translate = inject(TranslateService); + + public constructor() { + const diffVersion = inject(DIFF_VERSION); if (diffVersion === VERSION) { this.htmlDiff = HtmlDiff; } else { diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-controller.service.ts index 02c928d073..b9e21cf557 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { MotionComment } from '@app/domain/models/motions/motion-comment'; import { MotionCommentRepositoryService } from '@app/gateways/repositories/motions'; @@ -7,14 +7,13 @@ import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetin import { ViewMotionComment } from '../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionCommentControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: MotionCommentRepositoryService - ) { + protected override repo: MotionCommentRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MotionCommentRepositoryService); super(controllerServiceCollector, MotionComment, repo); } diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-section-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-section-controller.service.ts index 83750447a6..cd492bf8b3 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-section-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/comments/services/motion-comment-section-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { MotionCommentSection } from '@app/domain/models/motions/motion-comment-section'; import { MotionCommentSectionRepositoryService } from '@app/gateways/repositories/motions'; @@ -7,17 +7,16 @@ import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetin import { ViewMotionCommentSection } from '../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionCommentSectionControllerService extends BaseMeetingControllerService< ViewMotionCommentSection, MotionCommentSection > { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: MotionCommentSectionRepositoryService - ) { + protected override repo: MotionCommentSectionRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MotionCommentSectionRepositoryService); super(controllerServiceCollector, MotionCommentSection, repo); } diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/editors/services/motion-editor-controller/motion-editor-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/editors/services/motion-editor-controller/motion-editor-controller.service.ts index 9f8652afac..2669174193 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/editors/services/motion-editor-controller/motion-editor-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/editors/services/motion-editor-controller/motion-editor-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MotionEditor } from '@app/domain/models/motions/motion-editor'; import { MotionEditorRepositoryService } from '@app/gateways/repositories/motions'; import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; @@ -7,18 +7,15 @@ import { UserControllerService } from '@app/site/services/user-controller.servic import { BaseMotionMeetingUserControllerService } from '../../../util'; import { ViewMotionEditor } from '../../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionEditorControllerService extends BaseMotionMeetingUserControllerService< ViewMotionEditor, MotionEditor > { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - repo: MotionEditorRepositoryService, - userRepo: UserControllerService - ) { + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MotionEditorRepositoryService); + const userRepo = inject(UserControllerService); super(controllerServiceCollector, MotionEditor, repo, userRepo); } } diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/services/motion-block-controller.service/motion-block-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/services/motion-block-controller.service/motion-block-controller.service.ts index b38496de73..57ba1c6908 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/services/motion-block-controller.service/motion-block-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-blocks/services/motion-block-controller.service/motion-block-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { MotionBlock } from '@app/domain/models/motions/motion-block'; import { MotionBlockRepositoryService } from '@app/gateways/repositories/motions'; @@ -8,15 +8,14 @@ import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetin import { MotionControllerService } from '../../../../services/common/motion-controller.service/motion-controller.service'; import { ViewMotionBlock } from '../../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionBlockControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: MotionBlockRepositoryService, - private motionRepo: MotionControllerService - ) { + protected override repo: MotionBlockRepositoryService; + private motionRepo = inject(MotionControllerService); + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MotionBlockRepositoryService); super(controllerServiceCollector, MotionBlock, repo); } diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.ts index 9fe6f22604..f9ef68ab16 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-controller.service/motion-poll-controller.service.ts @@ -1,14 +1,12 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Fqid } from '@app/domain/definitions/key-types'; import { PollClassType } from '@app/domain/models/poll/poll-constants'; import { PollRepositoryService } from '@app/gateways/repositories/polls/poll-repository.service'; import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionPollControllerService { - public constructor(private repo: PollRepositoryService) {} + private repo = inject(PollRepositoryService); public getViewModelList(): ViewPoll[] { return this.repo.getViewModelList().filter(poll => poll.pollClassType === PollClassType.Motion); diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-dialog.service/motion-poll-dialog.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-dialog.service/motion-poll-dialog.service.ts index 2b14a21277..56b2f48a44 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-dialog.service/motion-poll-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-dialog.service/motion-poll-dialog.service.ts @@ -1,12 +1,10 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { BasePollDialogService } from '@app/site/pages/meetings/modules/poll/base/base-poll-dialog.service'; import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; import { MotionPollDialogComponent } from '../../components/motion-poll-dialog/motion-poll-dialog.component'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MotionPollDialogService extends BasePollDialogService { protected getComponent(): typeof MotionPollDialogComponent { return MotionPollDialogComponent; diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-pdf.service/motion-poll-pdf.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-pdf.service/motion-poll-pdf.service.ts index 76a92cdcef..024003ce27 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-pdf.service/motion-poll-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll-pdf.service/motion-poll-pdf.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { AbstractPollData, BasePollPdfService } from '@app/site/pages/meetings/modules/poll/base/base-poll-pdf.service'; import { ViewPoll } from '@app/site/pages/meetings/pages/polls'; import { TranslateService } from '@ngx-translate/core'; @@ -7,15 +7,13 @@ import { MotionControllerService } from '../../../../services/common/motion-cont import { ViewMotion } from '../../../../view-models'; import { MotionPollService } from '../motion-poll.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MotionPollPdfService extends BasePollPdfService { - public constructor( - protected override translate: TranslateService, - private motionRepo: MotionControllerService, - pollService: MotionPollService - ) { + protected override translate = inject(TranslateService); + private motionRepo = inject(MotionControllerService); + + public constructor() { + const pollService = inject(MotionPollService); super(pollService); this.meetingSettingsService .get(`motion_poll_ballot_paper_number`) diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts index 684d621597..47e24a4df9 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Motion } from '@app/domain/models/motions/motion'; import { OptionData, OptionDataKey, PollData, PollDataKey } from '@app/domain/models/poll/generic-poll'; import { Poll } from '@app/domain/models/poll/poll'; @@ -32,20 +32,18 @@ export interface TableDataEntryCreationInput { /** * Service class for motion polls. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionPollService extends PollService { public defaultPercentBase!: PollPercentBase; public defaultPollMethod: PollMethod | undefined; public defaultPollType!: PollType; public defaultGroupIds!: number[]; - public constructor( - protected override translate: TranslateService, - private repo: MotionPollControllerService, - private meetingSettingsService: MeetingSettingsService - ) { + protected override translate = inject(TranslateService); + private repo = inject(MotionPollControllerService); + private meetingSettingsService = inject(MeetingSettingsService); + + public constructor() { super(); this.meetingSettingsService .get(`motion_poll_default_onehundred_percent_base`) diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service.ts index d1505fe419..95c16b67e1 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/personal-notes/services/personal-note-controller.service/personal-note-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Fqid } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { PersonalNote } from '@app/domain/models/motions/personal-note'; @@ -11,14 +11,13 @@ import { map, Observable } from 'rxjs'; import { HasPersonalNote, ViewPersonalNote } from '../../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class PersonalNoteControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: PersonalNoteRepositoryService - ) { + protected override repo: PersonalNoteRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(PersonalNoteRepositoryService); super(controllerServiceCollector, PersonalNote, repo); } diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/states/services/motion-state-controller.service/motion-state-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/states/services/motion-state-controller.service/motion-state-controller.service.ts index d25b72e9b2..1617fc45d5 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/states/services/motion-state-controller.service/motion-state-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/states/services/motion-state-controller.service/motion-state-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { MotionState } from '@app/domain/models/motions/motion-state'; @@ -9,14 +9,13 @@ import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetin import { ViewMotionState } from '../../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionStateControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: MotionStateRepositoryService - ) { + protected override repo: MotionStateRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MotionStateRepositoryService); super(controllerServiceCollector, MotionState, repo); } diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/submitters/services/motion-submitter-controller/motion-submitter-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/submitters/services/motion-submitter-controller/motion-submitter-controller.service.ts index b8622b047a..76a55a02b4 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/submitters/services/motion-submitter-controller/motion-submitter-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/submitters/services/motion-submitter-controller/motion-submitter-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MotionSubmitter } from '@app/domain/models/motions/motion-submitter'; import { MotionSubmitterRepositoryService } from '@app/gateways/repositories/motions'; import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; @@ -7,18 +7,15 @@ import { UserControllerService } from '@app/site/services/user-controller.servic import { BaseMotionMeetingUserControllerService } from '../../../util'; import { ViewMotionSubmitter } from '../../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionSubmitterControllerService extends BaseMotionMeetingUserControllerService< ViewMotionSubmitter, MotionSubmitter > { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - repo: MotionSubmitterRepositoryService, - userRepo: UserControllerService - ) { + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MotionSubmitterRepositoryService); + const userRepo = inject(UserControllerService); super(controllerServiceCollector, MotionSubmitter, repo, userRepo); } } diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/supporters/services/motion-supporter-controller/motion-supporter-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/supporters/services/motion-supporter-controller/motion-supporter-controller.service.ts index 6020fbf96c..800b943057 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/supporters/services/motion-supporter-controller/motion-supporter-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/supporters/services/motion-supporter-controller/motion-supporter-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { MotionSupporter } from '@app/domain/models/motions/motion-supporter'; import { Action } from '@app/gateways/actions'; @@ -10,18 +10,17 @@ import { UserControllerService } from '@app/site/services/user-controller.servic import { ViewMotion } from '../../../../view-models'; import { ViewMotionSupporter } from '../../view-models/view-motion-supporter'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionSupporterControllerService extends BaseMeetingControllerService< ViewMotionSupporter, MotionSupporter > { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: MotionSupporterRepositoryService, - private userRepo: UserControllerService - ) { + protected override repo: MotionSupporterRepositoryService; + private userRepo = inject(UserControllerService); + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MotionSupporterRepositoryService); super(controllerServiceCollector, MotionSupporter, repo); } diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/workflows/services/motion-workflow-controller.service/motion-workflow-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/workflows/services/motion-workflow-controller.service/motion-workflow-controller.service.ts index 459aff55de..cacd944f61 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/workflows/services/motion-workflow-controller.service/motion-workflow-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/workflows/services/motion-workflow-controller.service/motion-workflow-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { MotionWorkflow } from '@app/domain/models/motions/motion-workflow'; @@ -11,14 +11,13 @@ import { ViewMotion } from '../../../../view-models'; import { ViewMotionState } from '../../../states'; import { ViewMotionWorkflow } from '../../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionWorkflowControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: MotionWorkflowRepositoryService - ) { + protected override repo: MotionWorkflowRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MotionWorkflowRepositoryService); super(controllerServiceCollector, MotionWorkflow, repo); } diff --git a/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/services/motion-working-group-speaker-controller/motion-working-group-speaker-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/services/motion-working-group-speaker-controller/motion-working-group-speaker-controller.service.ts index e4902a6833..fa351430fb 100644 --- a/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/services/motion-working-group-speaker-controller/motion-working-group-speaker-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/modules/working-group-speakers/services/motion-working-group-speaker-controller/motion-working-group-speaker-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MotionWorkingGroupSpeaker } from '@app/domain/models/motions/motion-working-group-speaker'; import { MotionWorkingGroupSpeakerRepositoryService } from '@app/gateways/repositories/motions'; import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; @@ -7,18 +7,15 @@ import { UserControllerService } from '@app/site/services/user-controller.servic import { BaseMotionMeetingUserControllerService } from '../../../util'; import { ViewMotionWorkingGroupSpeaker } from '../../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionWorkingGroupSpeakerControllerService extends BaseMotionMeetingUserControllerService< ViewMotionWorkingGroupSpeaker, MotionWorkingGroupSpeaker > { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - repo: MotionWorkingGroupSpeakerRepositoryService, - userRepo: UserControllerService - ) { + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MotionWorkingGroupSpeakerRepositoryService); + const userRepo = inject(UserControllerService); super(controllerServiceCollector, MotionWorkingGroupSpeaker, repo, userRepo); } } diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/services/motion-block-create-dialog.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/services/motion-block-create-dialog.service.ts index 92799991da..f11e475cb0 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/services/motion-block-create-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/services/motion-block-create-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { MotionBlock } from '@app/domain/models/motions/motion-block'; import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; @@ -6,9 +6,7 @@ import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { MotionBlockCreateDialogComponent } from '../components/motion-block-create-dialog/motion-block-create-dialog.component'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MotionBlockCreateDialogService extends BaseDialogService< MotionBlockCreateDialogComponent, null, diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/services/motion-block-edit-dialog.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/services/motion-block-edit-dialog.service.ts index 72dc60e64d..14e72df42a 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/services/motion-block-edit-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/services/motion-block-edit-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { MotionBlock } from '@app/domain/models/motions/motion-block'; import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; @@ -6,9 +6,7 @@ import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { MotionBlockEditDialogComponent } from '../components/motion-block-edit-dialog/motion-block-edit-dialog.component'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MotionBlockEditDialogService extends BaseDialogService< MotionBlockEditDialogComponent, MotionBlock, diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-detail-filter-list.service/motion-block-detail-filter-list.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-detail-filter-list.service/motion-block-detail-filter-list.service.ts index 6005b7207b..e346acc3f6 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-detail-filter-list.service/motion-block-detail-filter-list.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-detail-filter-list.service/motion-block-detail-filter-list.service.ts @@ -1,13 +1,10 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; -import { ActiveFiltersService } from '@app/site/services/active-filters.service'; import { TranslateService } from '@ngx-translate/core'; import { MotionListFilterService } from '../../../../services/list/motion-list-filter.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MotionBlockDetailFilterListService extends MotionListFilterService { protected override storageKey = `MotionBlock`; @@ -23,12 +20,7 @@ export class MotionBlockDetailFilterListService extends MotionListFilterService */ private _blockId = 0; - public constructor( - store: ActiveFiltersService, - protected override translate: TranslateService - ) { - super(store); - } + protected override translate = inject(TranslateService); /** * @override from parent diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-sort.service/motion-block-sort.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-sort.service/motion-block-sort.service.ts index ba00eadec1..5d7af9eb73 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-sort.service/motion-block-sort.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/services/motion-block-sort.service/motion-block-sort.service.ts @@ -1,13 +1,11 @@ -import { Injectable, ProviderToken } from '@angular/core'; +import { ProviderToken, Service } from '@angular/core'; import { BaseRepository } from '@app/gateways/repositories/base-repository'; import { MotionBlockRepositoryService } from '@app/gateways/repositories/motions'; import { BaseSortListService, OsSortingOption } from '@app/site/base/base-sort.service'; import { ViewMotionBlock } from '@app/site/pages/meetings/pages/motions'; import { _ } from '@ngx-translate/core'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionBlockSortService extends BaseSortListService { /** * set the storage key name diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/services/motion-change-recommendation-dialog.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/services/motion-change-recommendation-dialog.service.ts index aef482f1e8..e73731603d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/services/motion-change-recommendation-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/modules/motion-change-recommendation-dialog/services/motion-change-recommendation-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { infoDialogSettings, mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; @@ -11,11 +11,9 @@ import { MotionTitleChangeRecommendationDialogComponentData } from '../components/motion-title-change-recommendation-dialog/motion-title-change-recommendation-dialog.component'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MotionChangeRecommendationDialogService { - public constructor(private dialog: MatDialog) {} + private dialog = inject(MatDialog); public async openTitleChangeRecommendationDialog( data: MotionTitleChangeRecommendationDialogComponentData diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/services/motion-detail-view.service/motion-detail-view.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/services/motion-detail-view.service/motion-detail-view.service.ts index 56af211c20..b00ca1b525 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/services/motion-detail-view.service/motion-detail-view.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/services/motion-detail-view.service/motion-detail-view.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { Subject } from 'rxjs'; export enum ModifiedFinalVersionAction { @@ -7,9 +7,7 @@ export enum ModifiedFinalVersionAction { SAVE = `save` } -@Injectable({ - providedIn: 'root' -}) +@Service() export class MotionDetailViewService { public readonly modifiedFinalVersionActionSubject = new Subject(); } diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/services/motion-list-info-dialog.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/services/motion-list-info-dialog.service.ts index d2cba22e9e..67376b9e10 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/services/motion-list-info-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-list/modules/motion-list-info-dialog/services/motion-list-info-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { Identifiable } from '@app/domain/interfaces'; import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; @@ -7,9 +7,7 @@ import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { MotionListInfoDialogComponent } from '../components/motion-list-info-dialog/motion-list-info-dialog.component'; import { MotionListInfoDialogConfig } from '../definitions'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MotionListInfoDialogService extends BaseDialogService< MotionListInfoDialogComponent, Partial, diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/services/workflow-export.service/workflow-export.service.ts b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/services/workflow-export.service/workflow-export.service.ts index ababc9d325..026302d723 100644 --- a/client/src/app/site/pages/meetings/pages/motions/pages/workflows/services/workflow-export.service/workflow-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/pages/workflows/services/workflow-export.service/workflow-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MotionState } from '@app/domain/models/motions/motion-state'; import { MotionWorkflow } from '@app/domain/models/motions/motion-workflow'; import { ViewMotionWorkflow } from '@app/site/pages/meetings/pages/motions'; @@ -7,14 +7,10 @@ import { saveAs } from 'file-saver'; import { MotionStateControllerService } from '../../../../modules/states/services'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class WorkflowExportService { - public constructor( - private translate: TranslateService, - private stateRepo: MotionStateControllerService - ) {} + private translate = inject(TranslateService); + private stateRepo = inject(MotionStateControllerService); public exportWorkflows(...workflows: ViewMotionWorkflow[]): void { const workflowKeysToCopy: (keyof MotionWorkflow)[] = [`name`]; diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.ts index 43315beafb..5fe2f83de4 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/common/amendment-controller.service/amendment-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Motion } from '@app/domain/models/motions/motion'; @@ -10,14 +10,10 @@ import { distinctUntilChanged, map, Observable } from 'rxjs'; import { ViewMotion } from '../../../view-models'; import { MotionControllerService } from '../motion-controller.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class AmendmentControllerService { - public constructor( - private controller: MotionControllerService, - private repo: MotionRepositoryService - ) {} + private controller = inject(MotionControllerService); + private repo = inject(MotionRepositoryService); public getViewModelObservable(amendmentId: Id): Observable { return this.controller.getViewModelObservable(amendmentId); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-controller.service/motion-controller.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-controller.service/motion-controller.service.ts index 83f9f8c4db..8203928d08 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-controller.service/motion-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-controller.service/motion-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id, Ids } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Motion } from '@app/domain/models/motions/motion'; @@ -6,7 +6,6 @@ import { ChangeRecoMode } from '@app/domain/models/motions/motions.constants'; import { Action, createEmptyAction } from '@app/gateways/actions'; import { CreateResponse } from '@app/gateways/repositories/base-repository'; import { MotionRepositoryService } from '@app/gateways/repositories/motions'; -import { UserRepositoryService } from '@app/gateways/repositories/users'; import { TreeIdNode } from '@app/infrastructure/definitions/tree'; import { NullablePartial } from '@app/infrastructure/utils'; import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base-meeting-controller.service'; @@ -21,17 +20,16 @@ import { MotionLineNumberingService } from '../motion-line-numbering.service/mot export const REFERENCED_MOTION_REGEX = /\[motion[:/](\d+)\]/g; -@Injectable({ providedIn: `root` }) +@Service() export class MotionControllerService extends BaseMeetingControllerService { private _lineLength = 80; + protected override repo: MotionRepositoryService; + private motionLineNumbering = inject(MotionLineNumberingService); + private diffFactroy = inject(DiffServiceFactory); - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: MotionRepositoryService, - private motionLineNumbering: MotionLineNumberingService, - private diffFactroy: DiffServiceFactory, - private userRepo: UserRepositoryService - ) { + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(MotionRepositoryService); super(controllerServiceCollector, Motion, repo); this.meetingSettingsService.get(`motions_line_length`).subscribe(lineLength => (this._lineLength = lineLength)); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-format.service/motion-format.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-format.service/motion-format.service.ts index 8a41c8caaf..a3847a50b5 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-format.service/motion-format.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-format.service/motion-format.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { MotionFormattingRepresentation } from '@app/domain/models/motions/motion'; import { ChangeRecoMode, LineNumberingMode } from '@app/domain/models/motions/motions.constants'; @@ -70,17 +70,13 @@ interface MotionFormatDiffServices { lineNumberingService: LineNumberingService; } -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionFormatService { - public constructor( - private diffFactory: DiffServiceFactory, - private amendmentController: AmendmentControllerService, - private changeRecoRepo: MotionChangeRecommendationControllerService, - private settings: MeetingSettingsService, - private translate: TranslateService - ) {} + private diffFactory = inject(DiffServiceFactory); + private amendmentController = inject(AmendmentControllerService); + private changeRecoRepo = inject(MotionChangeRecommendationControllerService); + private settings = inject(MeetingSettingsService); + private translate = inject(TranslateService); /** * Format the motion text using the line numbering and change diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-line-numbering.service/motion-line-numbering.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-line-numbering.service/motion-line-numbering.service.ts index 89345d79eb..5521f48c29 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-line-numbering.service/motion-line-numbering.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-line-numbering.service/motion-line-numbering.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ChangeRecoMode } from '@app/domain/models/motions/motions.constants'; import { TranslateService } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; @@ -38,17 +38,13 @@ export interface ParagraphToChoose { lineTo: number; } -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionLineNumberingService { private amendmentChangeRecoMap: Record = {}; private amendmentChangeRecoSubscriptionMap: Record = {}; - public constructor( - private changeRecoRepo: MotionChangeRecommendationControllerService, - private translate: TranslateService - ) {} + private changeRecoRepo = inject(MotionChangeRecommendationControllerService); + private translate = inject(TranslateService); /** * Merges amendments and change recommendations and sorts them by the line numbers. diff --git a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts index 296c8e4668..aaa7889144 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/common/motion-permission.service/motion-permission.service.ts @@ -1,13 +1,11 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Permission } from '@app/domain/definitions/permission'; import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; import { OperatorService } from '@app/site/services/operator.service'; import { ViewMotion } from '../../../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionPermissionService { public configMinSupporters = 0; @@ -18,10 +16,10 @@ export class MotionPermissionService { private _forbidDelegatorCreateMotions = false; private _forbidDelegatorSupportMotions = false; - public constructor( - private operator: OperatorService, - private meetingSettingsService: MeetingSettingsService - ) { + private operator = inject(OperatorService); + private meetingSettingsService = inject(MeetingSettingsService); + + public constructor() { // load config variables this.meetingSettingsService .get(`motions_supporters_min_amount`) diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/amendment-list-pdf.service/amendment-list-pdf.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/amendment-list-pdf.service/amendment-list-pdf.service.ts index 4e18b2d3bc..9e21db3596 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/amendment-list-pdf.service/amendment-list-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/amendment-list-pdf.service/amendment-list-pdf.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { HtmlToPdfService } from '@app/gateways/export/html-to-pdf.service'; import { TranslateService } from '@ngx-translate/core'; import { Content, ContentTable, TableCell } from 'pdfmake/interfaces'; @@ -9,15 +9,11 @@ import { MotionControllerService } from '../../common/motion-controller.service' /** * Creates a PDF list for amendments */ -@Injectable({ - providedIn: `root` -}) +@Service() export class AmendmentListPdfService { - public constructor( - private motionService: MotionControllerService, - private translate: TranslateService, - private htmlToPdfService: HtmlToPdfService - ) {} + private motionService = inject(MotionControllerService); + private translate = inject(TranslateService); + private htmlToPdfService = inject(HtmlToPdfService); /** * Also required by amendment-detail. Should be own service diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.ts index 3c06d3c703..4c42dc0f42 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ChangeRecoMode, PERSONAL_NOTE_ID } from '@app/domain/models/motions/motions.constants'; import { CsvColumnDefinitionMap, CsvColumnDefinitionProperty } from '@app/gateways/export/csv-export.service'; import { reconvertChars, stripHtmlTags } from '@app/infrastructure/utils'; @@ -50,20 +50,16 @@ const MotionCsvExportExample: MotionCsvExport[] = [ } ]; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionCsvExportService { public crMode = ChangeRecoMode; - public constructor( - private csvExport: MeetingCsvExportService, - private translate: TranslateService, - private meetingSettingsService: MeetingSettingsService, - private motionService: MotionControllerService, - private motionFormatService: MotionFormatService, - private commentRepo: MotionCommentSectionControllerService - ) {} + private csvExport = inject(MeetingCsvExportService); + private translate = inject(TranslateService); + private meetingSettingsService = inject(MeetingSettingsService); + private motionService = inject(MotionControllerService); + private motionFormatService = inject(MotionFormatService); + private commentRepo = inject(MotionCommentSectionControllerService); /** * Creates the motion text diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-export.service/motion-export.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-export.service/motion-export.service.ts index 3fff34e179..e17c41f37f 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-export.service/motion-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-export.service/motion-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ChangeRecoMode, LineNumberingMode } from '@app/domain/models/motions/motions.constants'; import { PdfError } from '@app/gateways/export/pdf-document.service'; @@ -23,15 +23,11 @@ export interface MotionExportInfo { includePdfAttachments?: boolean; } -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionExportService { - public constructor( - private pdfExport: MotionPdfExportService, - private csvExport: MotionCsvExportService, - private xlsxExport: MotionXlsxExportService - ) {} + private pdfExport = inject(MotionPdfExportService); + private csvExport = inject(MotionCsvExportService); + private xlsxExport = inject(MotionXlsxExportService); public evaluateExportRequest(exportInfo: MotionExportInfo, data: ViewMotion[]): void { if (!exportInfo) { diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-html-to-pdf.service/motion-html-to-pdf.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-html-to-pdf.service/motion-html-to-pdf.service.ts index 6523eda858..f9df66f62e 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-html-to-pdf.service/motion-html-to-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-html-to-pdf.service/motion-html-to-pdf.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { LineNumberingMode } from '@app/domain/models/motions/motions.constants'; import { ChildNodeParagraphPayload, @@ -27,9 +27,7 @@ interface HtmlToPdfConfig { lineHeight?: number; } -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionHtmlToPdfService extends HtmlToPdfService { /** * holds the desired line number mode diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-catalog.service/motion-pdf-catalog.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-catalog.service/motion-pdf-catalog.service.ts index fc7aecbeab..6ac429106d 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-catalog.service/motion-pdf-catalog.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-catalog.service/motion-pdf-catalog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MOTION_PDF_OPTIONS } from '@app/domain/models/motions/motions.constants'; import { BorderType, PdfError, StyleType } from '@app/gateways/export/pdf-document.service'; import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; @@ -20,18 +20,14 @@ import { MotionPdfService } from '../motion-pdf.service'; * const docDef = this.motionPdfCatalogService.motionListToDocDef(myListOfViewMotions); * ``` */ -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionPdfCatalogService { - public constructor( - private translate: TranslateService, - private motionPdfService: MotionPdfService, - private pdfService: MeetingPdfExportService, - private motionService: MotionControllerService, - private categoryRepo: MotionCategoryControllerService, - private meetingSettingsService: MeetingSettingsService - ) {} + private translate = inject(TranslateService); + private motionPdfService = inject(MotionPdfService); + private pdfService = inject(MeetingPdfExportService); + private motionService = inject(MotionControllerService); + private categoryRepo = inject(MotionCategoryControllerService); + private meetingSettingsService = inject(MeetingSettingsService); /** * Converts the list of motions to pdfmake doc definition. diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-export.service/motion-pdf-export.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-export.service/motion-pdf-export.service.ts index 8b751cd878..1bd3f24a56 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-export.service/motion-pdf-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf-export.service/motion-pdf-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ProgressSnackBarService } from '@app/gateways/export/progress-snack-bar/services/progress-snack-bar.service'; import { ProgressSnackBarControlService } from '@app/gateways/export/progress-snack-bar/services/progress-snack-bar-control.service'; import { ViewMotionCommentSection } from '@app/site/pages/meetings/pages/motions'; @@ -16,19 +16,15 @@ import { MotionPdfCatalogService } from '../motion-pdf-catalog.service'; /** * Export service to handle various kind of exporting necessities. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionPdfExportService { - public constructor( - private translate: TranslateService, - private motionPdfService: MotionPdfService, - private amendmentListPdfService: AmendmentListPdfService, - private pdfCatalogService: MotionPdfCatalogService, - private pdfDocumentService: MeetingPdfExportService, - private progressSnackBarService: ProgressSnackBarService, - private progressService: ProgressSnackBarControlService - ) {} + private translate = inject(TranslateService); + private motionPdfService = inject(MotionPdfService); + private amendmentListPdfService = inject(AmendmentListPdfService); + private pdfCatalogService = inject(MotionPdfCatalogService); + private pdfDocumentService = inject(MeetingPdfExportService); + private progressSnackBarService = inject(ProgressSnackBarService); + private progressService = inject(ProgressSnackBarControlService); /** * Exports a single motions to PDFnumberOrTitle diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf.service/motion-pdf.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf.service/motion-pdf.service.ts index 5720ee80d3..2f307fd5f0 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf.service/motion-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-pdf.service/motion-pdf.service.ts @@ -1,5 +1,5 @@ import { Location } from '@angular/common'; -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ChangeRecoMode, LineNumberingMode, @@ -70,24 +70,20 @@ const PDF_A5_POINTS_WIDTH = 419.544; * const pdfMakeCompatibleDocDef = this.MotionPdfService.motionToDocDef(myMotion); * ``` */ -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionPdfService { - public constructor( - private translate: TranslateService, - private motionService: MotionControllerService, - private motionLineNumbering: MotionLineNumberingService, - private changeRecoRepo: MotionChangeRecommendationControllerService, - private meetingSettingsService: MeetingSettingsService, - private pdfDocumentService: MeetingPdfExportService, - private htmlToPdfService: MotionHtmlToPdfService, - private commentRepo: MotionCommentSectionControllerService, - private organizationSettingsService: OrganizationSettingsService, - private motionPollService: MotionPollService, - private motionFormatService: MotionFormatService, - private pdfImagesService: PdfImagesService - ) {} + private translate = inject(TranslateService); + private motionService = inject(MotionControllerService); + private motionLineNumbering = inject(MotionLineNumberingService); + private changeRecoRepo = inject(MotionChangeRecommendationControllerService); + private meetingSettingsService = inject(MeetingSettingsService); + private pdfDocumentService = inject(MeetingPdfExportService); + private htmlToPdfService = inject(MotionHtmlToPdfService); + private commentRepo = inject(MotionCommentSectionControllerService); + private organizationSettingsService = inject(OrganizationSettingsService); + private motionPollService = inject(MotionPollService); + private motionFormatService = inject(MotionFormatService); + private pdfImagesService = inject(PdfImagesService); /** * Converts a motion to PdfMake doc definition diff --git a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-xlsx-export.service/motion-xlsx-export.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-xlsx-export.service/motion-xlsx-export.service.ts index ac161c3f01..113ca98bf4 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/export/motion-xlsx-export.service/motion-xlsx-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/export/motion-xlsx-export.service/motion-xlsx-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Ids } from '@app/domain/definitions/key-types'; import { PERSONAL_NOTE_ID } from '@app/domain/models/motions/motions.constants'; import { CellFillingDefinition, XlsxExportService } from '@app/gateways/export/xlsx-export.service'; @@ -22,9 +22,7 @@ interface MotionXlsxExportConfig { /** * Service to export motion elements to XLSX */ -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionXlsxExportService { /** * Determine the default font size @@ -64,12 +62,10 @@ export class MotionXlsxExportService { } }; - public constructor( - private xlsx: XlsxExportService, - private translate: TranslateService, - private motionService: MotionControllerService, - private commentRepo: MotionCommentSectionControllerService - ) {} + private xlsx = inject(XlsxExportService); + private translate = inject(TranslateService); + private motionService = inject(MotionControllerService); + private commentRepo = inject(MotionCommentSectionControllerService); /** * Export motions as XLSX diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-filter.service/amendment-list-filter.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-filter.service/amendment-list-filter.service.ts index 089b72dcc8..f81d405e53 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-filter.service/amendment-list-filter.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-filter.service/amendment-list-filter.service.ts @@ -1,15 +1,12 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { OsFilter } from '@app/site/base/base-filter.service'; import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; -import { ActiveFiltersService } from '@app/site/services/active-filters.service'; import { TranslateService } from '@ngx-translate/core'; import { MotionControllerService } from '../../common/motion-controller.service'; import { MotionListFilterService } from '../motion-list-filter.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class AmendmentListFilterService extends MotionListFilterService { /** * Private accessor for an amendment id @@ -43,12 +40,11 @@ export class AmendmentListFilterService extends MotionListFilterService { this.updateStorageKey(); } - public constructor( - store: ActiveFiltersService, - protected override translate: TranslateService, - motionRepo: MotionControllerService - ) { - super(store); + protected override translate = inject(TranslateService); + + public constructor() { + const motionRepo = inject(MotionControllerService); + super(); this.updateFilterForRepo({ repo: motionRepo, diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-sort.service/amendment-list-sort.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-sort.service/amendment-list-sort.service.ts index d4222a010a..730cedab2a 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-sort.service/amendment-list-sort.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/list/amendment-list-sort.service/amendment-list-sort.service.ts @@ -1,12 +1,10 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { OsSortingOption } from '@app/site/base/base-sort.service'; import { ViewMotion } from '@app/site/pages/meetings/pages/motions'; import { MotionListBaseSortService } from '../motion-list-base-sort.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class AmendmentListSortService extends MotionListBaseSortService { /** * set the storage key name diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-filter.service/motion-list-filter.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-filter.service/motion-list-filter.service.ts index 2a44e196db..5aaa7b5cb4 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-filter.service/motion-list-filter.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-filter.service/motion-list-filter.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Permission } from '@app/domain/definitions/permission'; import { Restriction } from '@app/domain/models/motions/motion-state'; @@ -37,9 +37,7 @@ interface WorkflowConfiguration { /** * Filter the motion list */ -@Injectable({ - providedIn: 'root' -}) +@Service() export class MotionListFilterService extends BaseFilterListService { /** * set the storage key name @@ -201,7 +199,8 @@ export class MotionListFilterService extends BaseFilterListService { private operator = inject(OperatorService); private meetingSettingsService = inject(MeetingSettingsService); - public constructor(store: ActiveFiltersService) { + public constructor() { + const store = inject(ActiveFiltersService); super(store); this.getWorkflowConfig(); this.getShowAmendmentConfig(); diff --git a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-sort.service/motion-list-sort.service.ts b/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-sort.service/motion-list-sort.service.ts index e0df5155d2..0e123f7f3c 100644 --- a/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-sort.service/motion-list-sort.service.ts +++ b/client/src/app/site/pages/meetings/pages/motions/services/list/motion-list-sort.service/motion-list-sort.service.ts @@ -1,10 +1,8 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MotionListBaseSortService } from '../motion-list-base-sort.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MotionListSortService extends MotionListBaseSortService { /** * Constructor. diff --git a/client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.ts b/client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.ts index 2d6a0f4f68..9d841cf7e6 100644 --- a/client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/export/participant-csv-export.service/participant-csv-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { UserExport } from '@app/domain/models/users/user.export'; import { CsvColumnDefinitionMap, @@ -19,9 +19,7 @@ export interface ParticipantExport extends UserExport { locked_out?: boolean; } -@Injectable({ - providedIn: 'root' -}) +@Service() export class ParticipantCsvExportService { // private _csvColumnDefinitionMapsMap: Map> = new Map([ // [ @@ -44,10 +42,8 @@ export class ParticipantCsvExportService { // ] // ]); - public constructor( - private csvExport: MeetingCsvExportForBackendService, - private translate: TranslateService - ) {} + private csvExport = inject(MeetingCsvExportForBackendService); + private translate = inject(TranslateService); public export(participants: ViewUser[]): void { this.csvExport.export( diff --git a/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf-export.service/participant-pdf-export.service.ts b/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf-export.service/participant-pdf-export.service.ts index 7d926ce5be..9a87d75e4a 100644 --- a/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf-export.service/participant-pdf-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf-export.service/participant-pdf-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MeetingPdfExportService } from '@app/site/pages/meetings/services/export/meeting-pdf-export.service'; import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { TranslateService } from '@ngx-translate/core'; @@ -9,15 +9,11 @@ import { ParticipantPdfService } from '../participant-pdf.service'; /** * Export service to handle various kind of exporting necessities for participants. */ -@Injectable({ - providedIn: 'root' -}) +@Service() export class ParticipantPdfExportService { - public constructor( - private translate: TranslateService, - private userPdfService: ParticipantPdfService, - private pdfDocumentService: MeetingPdfExportService - ) {} + private translate = inject(TranslateService); + private userPdfService = inject(ParticipantPdfService); + private pdfDocumentService = inject(MeetingPdfExportService); /** * Export a participants list as PDF diff --git a/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf.service/participant-pdf.service.ts b/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf.service/participant-pdf.service.ts index 69459df0f5..ae6c7b166c 100644 --- a/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf.service/participant-pdf.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/export/participant-pdf.service/participant-pdf.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { OrganizationSettingsService } from '@app/site/pages/organization/services/organization-settings.service'; @@ -15,18 +15,11 @@ import { Column, Content, ContentColumns, ContentTable, TableCell } from 'pdfmak * const pdfMakeCompatibleDocDef = this.UserPdfService.createUserListDocDef(Users); * ``` */ -@Injectable({ - providedIn: 'root' -}) +@Service() export class ParticipantPdfService { - /** - * Constructor - */ - public constructor( - private translate: TranslateService, - private meetingSettingsService: MeetingSettingsService, - private orgaSettingsService: OrganizationSettingsService - ) {} + private translate = inject(TranslateService); + private meetingSettingsService = inject(MeetingSettingsService); + private orgaSettingsService = inject(OrganizationSettingsService); /** * Converts a user to PdfMake doc definition, containing access information diff --git a/client/src/app/site/pages/meetings/pages/participants/export/speaker-csv-export.service/speaker-csv-export.service.ts b/client/src/app/site/pages/meetings/pages/participants/export/speaker-csv-export.service/speaker-csv-export.service.ts index 49e716d37e..d819cd3fde 100644 --- a/client/src/app/site/pages/meetings/pages/participants/export/speaker-csv-export.service/speaker-csv-export.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/export/speaker-csv-export.service/speaker-csv-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { CsvColumnDefinitionMap, CsvColumnDefinitionProperty, @@ -25,16 +25,12 @@ export const speakerHeadersAndVerboseNames = { topic: _(`Element`) }; -@Injectable({ - providedIn: 'root' -}) +@Service() export class SpeakerCsvExportService { - public constructor( - private csvExport: MeetingCsvExportForBackendService, - private translate: TranslateService, - private durationService: DurationService, - private dfnsConfig: DateFnsConfigurationService - ) {} + private csvExport = inject(MeetingCsvExportForBackendService); + private translate = inject(TranslateService); + private durationService = inject(DurationService); + private dfnsConfig = inject(DateFnsConfigurationService); private columnMappings = { begin_time: (speaker: ViewSpeaker): string => diff --git a/client/src/app/site/pages/meetings/pages/participants/modules/groups/services/group-controller.service.ts b/client/src/app/site/pages/meetings/pages/participants/modules/groups/services/group-controller.service.ts index 0a1ea529de..46c2d391e2 100644 --- a/client/src/app/site/pages/meetings/pages/participants/modules/groups/services/group-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/modules/groups/services/group-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Group } from '@app/domain/models/users/group'; @@ -27,14 +27,13 @@ export class MeetingGroupsObject { } } -@Injectable({ - providedIn: `root` -}) +@Service() export class GroupControllerService extends BaseMeetingControllerService { - public constructor( - repositoryServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: GroupRepositoryService - ) { + protected override repo: GroupRepositoryService; + + public constructor() { + const repositoryServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(GroupRepositoryService); super(repositoryServiceCollector, ViewGroup, repo); } diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/services/participant-import.service/participant-import.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/services/participant-import.service/participant-import.service.ts index 4ec214098c..0113a4d2a0 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/services/participant-import.service/participant-import.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-import/services/participant-import.service/participant-import.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { BaseBackendImportService } from '@app/site/base/base-import.service/base-backend-import.service'; import { ParticipantControllerService } from '@app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service'; import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; @@ -8,9 +8,7 @@ import { _ } from '@ngx-translate/core'; import { ParticipantCsvExportService } from '../../../../export/participant-csv-export.service/participant-csv-export.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class ParticipantImportService extends BaseBackendImportService { /** * The minimimal number of header entries needed to successfully create an entry @@ -41,12 +39,12 @@ export class ParticipantImportService extends BaseBackendImportService { 'structure levels created': _(`Structure levels created`) }; - public constructor( - importServiceCollector: ImportServiceCollectorService, - private repo: ParticipantControllerService, - private activeMeetingIdService: ActiveMeetingIdService, - private exporter: ParticipantCsvExportService - ) { + private repo = inject(ParticipantControllerService); + private activeMeetingIdService = inject(ActiveMeetingIdService); + private exporter = inject(ParticipantCsvExportService); + + public constructor() { + const importServiceCollector = inject(ImportServiceCollectorService); super(importServiceCollector); } diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts index bbbcdda69a..3ce644060c 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/modules/participant-list-info-dialog/services/participant-list-info-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; @@ -44,9 +44,7 @@ export interface InfoDialog { vote_delegated_to_id: number; } -@Injectable({ - providedIn: 'root' -}) +@Service() export class ParticipantListInfoDialogService extends BaseDialogService< ParticipantListInfoDialogComponent, Partial, diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.ts index fc6309fcf8..115bf8b507 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-list/services/participant-list-filter/participant-list-filter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Permission } from '@app/domain/definitions/permission'; import { BaseFilterListService, OsFilter, OsHideFilterSetting } from '@app/site/base/base-filter.service'; import { MeetingSettingsService } from '@app/site/pages/meetings/services/meeting-settings.service'; @@ -12,9 +12,7 @@ import { _ } from '@ngx-translate/core'; import { GroupControllerService } from '../../../../modules/groups/services/group-controller.service'; import { StructureLevelControllerService } from '../../../structure-levels/services/structure-level-controller.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class ParticipantListFilterService extends BaseFilterListService { /** * set the storage key name @@ -48,14 +46,14 @@ export class ParticipantListFilterService extends BaseFilterListService { /** * set the storage key name @@ -42,10 +40,10 @@ export class ParticipantListSortService extends BaseSortListService { private _voteWeightEnabled: boolean; - public constructor( - private meetingSettings: MeetingSettingsService, - private operator: OperatorService - ) { + private meetingSettings = inject(MeetingSettingsService); + private operator = inject(OperatorService); + + public constructor() { super({ sortProperty: [`first_name`, `last_name`], sortAscending: true diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-filter.service/participant-speaker-list-filter.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-filter.service/participant-speaker-list-filter.service.ts index f8bc337a02..d3af3bff8f 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-filter.service/participant-speaker-list-filter.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/participant-speaker-list/services/participant-speaker-list-filter.service/participant-speaker-list-filter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { SpeechState } from '@app/domain/models/speakers/speech-state'; import { GENDER_FITLERABLE, GENDERS } from '@app/domain/models/users/user'; import { BaseFilterListService, OsFilter, OsHideFilterSetting } from '@app/site/base/base-filter.service'; @@ -8,9 +8,7 @@ import { _ } from '@ngx-translate/core'; import { SpeechWaitingState, ViewSpeaker } from '../../../../../agenda'; import { StructureLevelControllerService } from '../../../structure-levels/services/structure-level-controller.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class ParticipantSpeakerListFilterService extends BaseFilterListService { /** * set the storage key name @@ -23,7 +21,9 @@ export class ParticipantSpeakerListFilterService extends BaseFilterListService { /** * set the storage key name diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-controller.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-controller.service.ts index 0ff80083ed..9d404a5d10 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { StructureLevel } from '@app/domain/models/structure-levels/structure-level'; @@ -9,14 +9,13 @@ import { Observable } from 'rxjs'; import { ViewStructureLevel } from '../view-models/view-structure-level'; -@Injectable({ - providedIn: `root` -}) +@Service() export class StructureLevelControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: StructureLevelRepositoryService - ) { + protected override repo: StructureLevelRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(StructureLevelRepositoryService); super(controllerServiceCollector, StructureLevel, repo); } diff --git a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-sort.service.ts b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-sort.service.ts index 4dc01c4d19..b2c6099a9a 100644 --- a/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-sort.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/pages/structure-levels/services/structure-level-sort.service.ts @@ -1,12 +1,10 @@ -import { Injectable, ProviderToken } from '@angular/core'; +import { ProviderToken, Service } from '@angular/core'; import { BaseRepository } from '@app/gateways/repositories/base-repository'; import { StructureLevelRepositoryService } from '@app/gateways/repositories/structure-levels'; import { BaseSortListService, OsSortingOption } from '@app/site/base/base-sort.service'; import { ViewStructureLevel } from '@app/site/pages/meetings/pages/participants/pages/structure-levels/view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class StructureLevelSortService extends BaseSortListService { /** * set the storage key name diff --git a/client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.ts b/client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.ts index 70bcea8d17..425aaa2b36 100644 --- a/client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/participants/services/common/participant-controller.service/participant-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { MeetingUser } from '@app/domain/models/meeting-users/meeting-user'; @@ -52,9 +52,7 @@ export const MEETING_RELATED_FORM_CONTROLS = [ `locked_out` ]; -@Injectable({ - providedIn: 'root' -}) +@Service() export class ParticipantControllerService extends BaseMeetingControllerService { private _participantListSubject = new BehaviorSubject([]); @@ -62,18 +60,19 @@ export class ParticipantControllerService extends BaseMeetingControllerService>({}); - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: UserRepositoryService, - private meetingUserRepo: MeetingUserRepositoryService, - public meetingController: MeetingControllerService, - private userController: UserControllerService, - private userDeleteDialog: UserDeleteDialogService, - private userScopePresenter: GetUserScopePresenterService, - private userRelatedModelsPresenter: GetUserRelatedModelsPresenterService, - private userService: UserService, - private actions: ActionService - ) { + protected override repo: UserRepositoryService; + private meetingUserRepo = inject(MeetingUserRepositoryService); + public meetingController = inject(MeetingControllerService); + private userController = inject(UserControllerService); + private userDeleteDialog = inject(UserDeleteDialogService); + private userScopePresenter = inject(GetUserScopePresenterService); + private userRelatedModelsPresenter = inject(GetUserRelatedModelsPresenterService); + private userService = inject(UserService); + private actions = inject(ActionService); + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(UserRepositoryService); super(controllerServiceCollector, User, repo); let meetingUserIds = []; diff --git a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.ts b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.ts index d60a4281ac..b1ea6978a0 100644 --- a/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.ts +++ b/client/src/app/site/pages/meetings/pages/polls/modules/poll-list/services/poll-list-filter.service/poll-list-filter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { PollState } from '@app/domain/models/poll/poll-constants'; import { BaseFilterListService, OsFilter } from '@app/site/base/base-filter.service'; import { ActiveFiltersService } from '@app/site/services/active-filters.service'; @@ -6,19 +6,17 @@ import { TranslateService } from '@ngx-translate/core'; import { ViewPoll } from '../../../../view-models'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class PollListFilterService extends BaseFilterListService { /** * set the storage key name */ protected storageKey = `PollList`; - public constructor( - store: ActiveFiltersService, - private translate: TranslateService - ) { + private translate = inject(TranslateService); + + public constructor() { + const store = inject(ActiveFiltersService); super(store); } diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/services/projector-countdown-dialog.service.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/services/projector-countdown-dialog.service.ts index fedc8bb048..f35a78a4f3 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/services/projector-countdown-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-countdown-dialog/services/projector-countdown-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { infoDialogSettings } from '@app/infrastructure/utils/dialog-settings'; import { BaseDialogService } from '@app/ui/base/base-dialog-service'; @@ -6,7 +6,7 @@ import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { ProjectorCountdownDialogComponent } from '../components/projector-countdown-dialog/projector-countdown-dialog.component'; import { CountdownDialogData } from '../definitions'; -@Injectable({ providedIn: 'root' }) +@Service() export class ProjectorCountdownDialogService extends BaseDialogService< ProjectorCountdownDialogComponent, Partial, diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/services/projector-edit-dialog.service.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/services/projector-edit-dialog.service.ts index 438caeb523..2311a2058a 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/services/projector-edit-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/services/projector-edit-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { Projector } from '@app/domain/models/projector/projector'; import { largeDialogSettings } from '@app/infrastructure/utils/dialog-settings'; @@ -8,15 +8,13 @@ import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { ProjectorEditDialogComponent } from '../components/projector-edit-dialog/projector-edit-dialog.component'; -@Injectable({ providedIn: 'root' }) +@Service() export class ProjectorEditDialogService extends BaseDialogService< ProjectorEditDialogComponent, ViewProjector, Partial > { - public constructor(private controller: ProjectorControllerService) { - super(); - } + private controller = inject(ProjectorControllerService); public async open( projector: ViewProjector diff --git a/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/services/projector-message-dialog.service.ts b/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/services/projector-message-dialog.service.ts index 6f1b4a30c6..a19a763afa 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/services/projector-message-dialog.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/components/projector-message-dialog/services/projector-message-dialog.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { largeDialogSettings } from '@app/infrastructure/utils/dialog-settings'; import { BaseDialogService } from '@app/ui/base/base-dialog-service'; @@ -6,9 +6,7 @@ import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { ProjectorMessageDialogComponent } from '../components/projector-message-dialog/projector-message-dialog.component'; import { MessageDialogData } from '../definitions'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ProjectorMessageDialogService extends BaseDialogService< ProjectorMessageDialogComponent, Partial, diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/current-speaker-chyron-slide.service/current-speaker-chyron-slide.service.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/current-speaker-chyron-slide.service/current-speaker-chyron-slide.service.ts index cd59fcc16e..d5c843e17b 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/current-speaker-chyron-slide.service/current-speaker-chyron-slide.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/current-speaker-chyron-slide.service/current-speaker-chyron-slide.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { PROJECTIONDEFAULT } from '@app/domain/models/projector/projection-default'; import { MeetingProjectionType } from '@app/gateways/repositories/meeting-repository.service'; import { ViewProjector } from '@app/site/pages/meetings/pages/projectors'; @@ -8,13 +8,11 @@ import { ProjectionBuildDescriptor } from '@app/site/pages/meetings/view-models' import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; -@Injectable({ providedIn: 'root' }) +@Service() export class CurrentSpeakerChyronSlideService { - public constructor( - private activeMeetingIdService: ActiveMeetingIdService, - private repo: ProjectorControllerService, - private translate: TranslateService - ) {} + private activeMeetingIdService = inject(ActiveMeetingIdService); + private repo = inject(ProjectorControllerService); + private translate = inject(TranslateService); /** * @returns the slide build descriptor for the overlay or slide diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projection-controller.service/projection-controller.service.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projection-controller.service/projection-controller.service.ts index 5c0e0b0f77..63985f3879 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projection-controller.service/projection-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projection-controller.service/projection-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { Projection } from '@app/domain/models/projector/projection'; import { ProjectionRepositoryService } from '@app/gateways/repositories/projections/projection-repository.service'; @@ -6,13 +6,14 @@ import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base import { ViewProjection } from '@app/site/pages/meetings/pages/projectors'; import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; -@Injectable({ providedIn: 'root' }) +@Service() export class ProjectionControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: ProjectionRepositoryService - ) { + protected override repo: ProjectionRepositoryService; + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(ProjectionRepositoryService); super(controllerServiceCollector, Projection, repo); + this.repo = repo; } public updateOption(projection: ViewProjection): Promise { diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-countdown-controller.service/projector-countdown-controller.service.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-countdown-controller.service/projector-countdown-controller.service.ts index 745572b32d..6e79808290 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-countdown-controller.service/projector-countdown-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-countdown-controller.service/projector-countdown-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { ProjectorCountdown } from '@app/domain/models/projector/projector-countdown'; import { ProjectorCountdownRepositoryService } from '@app/gateways/repositories/projector-countdowns/projector-countdown-repository.service'; @@ -6,15 +6,16 @@ import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base import { ViewProjectorCountdown } from '@app/site/pages/meetings/pages/projectors'; import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; -@Injectable({ providedIn: 'root' }) +@Service() export class ProjectorCountdownControllerService extends BaseMeetingControllerService< ViewProjectorCountdown, ProjectorCountdown > { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: ProjectorCountdownRepositoryService - ) { + protected override repo: ProjectorCountdownRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(ProjectorCountdownRepositoryService); super(controllerServiceCollector, ProjectorCountdown, repo); } diff --git a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-message-controller.service/projector-message-controller.service.ts b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-message-controller.service/projector-message-controller.service.ts index 336c4bc12d..dbdf7e2fd1 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-message-controller.service/projector-message-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/modules/projector-detail/services/projector-message-controller.service/projector-message-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Identifiable } from '@app/domain/interfaces'; import { ProjectorMessage } from '@app/domain/models/projector/projector-message'; import { ProjectorMessageRepositoryService } from '@app/gateways/repositories/projector-messages/projector-message-repository.service'; @@ -6,16 +6,17 @@ import { BaseMeetingControllerService } from '@app/site/pages/meetings/base/base import { ViewProjectorMessage } from '@app/site/pages/meetings/pages/projectors'; import { MeetingControllerServiceCollectorService } from '@app/site/pages/meetings/services/meeting-controller-service-collector.service'; -@Injectable({ providedIn: 'root' }) +@Service() export class ProjectorMessageControllerService extends BaseMeetingControllerService< ViewProjectorMessage, ProjectorMessage > { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: ProjectorMessageRepositoryService - ) { + protected override repo: ProjectorMessageRepositoryService; + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(ProjectorMessageRepositoryService); super(controllerServiceCollector, ProjectorMessage, repo); + this.repo = repo; } public create(payload: any): Promise { diff --git a/client/src/app/site/pages/meetings/pages/projectors/services/projector-controller.service.ts b/client/src/app/site/pages/meetings/pages/projectors/services/projector-controller.service.ts index fc5d854173..56616ba8b5 100644 --- a/client/src/app/site/pages/meetings/pages/projectors/services/projector-controller.service.ts +++ b/client/src/app/site/pages/meetings/pages/projectors/services/projector-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Ids } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { PROJECTIONDEFAULTS } from '@app/domain/models/projector/projection-default'; @@ -19,15 +19,14 @@ import { } from '../../../view-models'; import { ViewProjection, ViewProjector } from '../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ProjectorControllerService extends BaseMeetingControllerService { - public constructor( - controllerServiceCollector: MeetingControllerServiceCollectorService, - protected override repo: ProjectorRepositoryService, - private meetingRepo: MeetingRepositoryService - ) { + private meetingRepo = inject(MeetingRepositoryService); + protected override repo: ProjectorRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(MeetingControllerServiceCollectorService); + const repo = inject(ProjectorRepositoryService); super(controllerServiceCollector, Projector, repo); } diff --git a/client/src/app/site/pages/meetings/services/active-meeting-id.service.ts b/client/src/app/site/pages/meetings/services/active-meeting-id.service.ts index 35b213a623..e423669460 100644 --- a/client/src/app/site/pages/meetings/services/active-meeting-id.service.ts +++ b/client/src/app/site/pages/meetings/services/active-meeting-id.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Router, RoutesRecognized } from '@angular/router'; import { Id } from '@app/domain/definitions/key-types'; import { BehaviorSubject, distinctUntilChanged, filter, map, Observable, Subject } from 'rxjs'; @@ -16,9 +16,7 @@ export interface MeetingIdChangedEvent extends MeetingIdDifferEvent { hasChanged: boolean; } -@Injectable({ - providedIn: `root` -}) +@Service() export class ActiveMeetingIdService { public get meetingIdChanged(): Observable { return this._meetingIdChangedSubject.pipe( @@ -44,10 +42,10 @@ export class ActiveMeetingIdService { // undefined to specify it is not initialized private readonly _meetingIdSubject = new BehaviorSubject(undefined); - public constructor( - router: Router, - private DS: MeetingDataStoreService - ) { + private DS = inject(MeetingDataStoreService); + + public constructor() { + const router = inject(Router); router.events .pipe( filter((event): boolean => event instanceof RoutesRecognized), diff --git a/client/src/app/site/pages/meetings/services/active-meeting.service.ts b/client/src/app/site/pages/meetings/services/active-meeting.service.ts index 6983273697..88cb75f7a5 100644 --- a/client/src/app/site/pages/meetings/services/active-meeting.service.ts +++ b/client/src/app/site/pages/meetings/services/active-meeting.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Router } from '@angular/router'; import { Id } from '@app/domain/definitions/key-types'; import { BannerDefinition, BannerService } from '@app/site/modules/site-wrapper/services/banner.service'; @@ -15,9 +15,7 @@ import { ArchiveStatusService } from './archive-status.service'; import { MeetingControllerService } from './meeting-controller.service'; import { MeetingSettingsDefinitionService } from './meeting-settings-definition.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ActiveMeetingService { public get guestsEnabled(): boolean { const activeMeeting = this._meetingSubject.getValue(); diff --git a/client/src/app/site/pages/meetings/services/active-polls.service.ts b/client/src/app/site/pages/meetings/services/active-polls.service.ts index f8a02d75fe..e8e6c48dcb 100644 --- a/client/src/app/site/pages/meetings/services/active-polls.service.ts +++ b/client/src/app/site/pages/meetings/services/active-polls.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { viewModelListEqual } from '@app/infrastructure/utils'; import { ModelRequestService } from '@app/site/services/model-request.service'; @@ -9,9 +9,7 @@ import { ViewPoll } from '../pages/polls'; import { ActiveMeetingIdService } from './active-meeting-id.service'; import { ACTIVE_POLLS_SUBSCRIPTION, getActivePollsSubscriptionConfig } from './active-polls.subscription'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ActivePollsService { public pollIds!: Id[]; @@ -27,11 +25,11 @@ export class ActivePollsService { return this._pollSubject.getValue(); } - public constructor( - private activeMeetingIdService: ActiveMeetingIdService, - private repo: PollControllerService, - private modelRequestService: ModelRequestService - ) { + private activeMeetingIdService = inject(ActiveMeetingIdService); + private repo = inject(PollControllerService); + private modelRequestService = inject(ModelRequestService); + + public constructor() { this.refreshRepoSubscription(); } diff --git a/client/src/app/site/pages/meetings/services/archive-status.service.ts b/client/src/app/site/pages/meetings/services/archive-status.service.ts index 75a254ebb3..29d47f9406 100644 --- a/client/src/app/site/pages/meetings/services/archive-status.service.ts +++ b/client/src/app/site/pages/meetings/services/archive-status.service.ts @@ -1,13 +1,11 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; /** * A service to hold information about the `archive`-status of a meeting. * Necessary, because there is a circular dependency if the `ActionService` injects the `ActiveMeetingService`. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class ArchiveStatusService { public get isArchived(): boolean { return this.isArchivedEvent.value; diff --git a/client/src/app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service.ts b/client/src/app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service.ts index b1a3344b02..429d61d407 100644 --- a/client/src/app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service.ts +++ b/client/src/app/site/pages/meetings/services/export/meeting-csv-export-for-backend.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { CsvColumnsDefinition, DEFAULT_COLUMN_SEPARATOR, @@ -10,13 +10,9 @@ import { BaseViewModel } from '@app/site/base/base-view-model'; import { MeetingSettingsService } from '../meeting-settings.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MeetingCsvExportForBackendService extends CsvExportForBackendService { - public constructor(private meetingSettings: MeetingSettingsService) { - super(); - } + private meetingSettings = inject(MeetingSettingsService); /** * Saves an array of model data to a CSV. diff --git a/client/src/app/site/pages/meetings/services/export/meeting-csv-export.service.ts b/client/src/app/site/pages/meetings/services/export/meeting-csv-export.service.ts index 30f0b5d829..f0042979fd 100644 --- a/client/src/app/site/pages/meetings/services/export/meeting-csv-export.service.ts +++ b/client/src/app/site/pages/meetings/services/export/meeting-csv-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { CsvColumnsDefinition, CsvExportService, @@ -10,13 +10,9 @@ import { BaseViewModel } from '@app/site/base/base-view-model'; import { MeetingSettingsService } from '../meeting-settings.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MeetingCsvExportService extends CsvExportService { - public constructor(private meetingSettings: MeetingSettingsService) { - super(); - } + private meetingSettings = inject(MeetingSettingsService); /** * Saves an array of model data to a CSV. diff --git a/client/src/app/site/pages/meetings/services/export/meeting-pdf-export.service.ts b/client/src/app/site/pages/meetings/services/export/meeting-pdf-export.service.ts index 2fae022916..0fbef53942 100644 --- a/client/src/app/site/pages/meetings/services/export/meeting-pdf-export.service.ts +++ b/client/src/app/site/pages/meetings/services/export/meeting-pdf-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { FontPlace } from '@app/domain/models/mediafiles/mediafile.constants'; import { PdfDocumentService, @@ -24,10 +24,13 @@ interface MeetingDownloadConfig extends MeetingDownloadLandscapeConfig { disableProgress?: boolean; } -@Injectable({ - providedIn: `root` -}) +@Service() export class MeetingPdfExportService { + private pdfExportService = inject(PdfDocumentService); + private meetingSettingsService = inject(MeetingSettingsService); + private httpService = inject(HttpService); + private mediaManageService = inject(MediaManageService); + private get fontSize(): number | null { return this.meetingSettingsService.instant(`export_pdf_fontsize`); } @@ -52,13 +55,6 @@ export class MeetingPdfExportService { return mmToPoints(this.meetingSettingsService.instant(`export_pdf_page_margin_bottom`)!); } - public constructor( - private pdfExportService: PdfDocumentService, - private meetingSettingsService: MeetingSettingsService, - private httpService: HttpService, - private mediaManageService: MediaManageService - ) {} - public blob(config: MeetingDownloadConfig): Promise { const pageMargins: [number, number, number, number] = [ this.pageMarginPointsLeft, diff --git a/client/src/app/site/pages/meetings/services/load-font.service.ts b/client/src/app/site/pages/meetings/services/load-font.service.ts index 3f06089c10..56aacc9ef9 100644 --- a/client/src/app/site/pages/meetings/services/load-font.service.ts +++ b/client/src/app/site/pages/meetings/services/load-font.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MediaManageService } from './media-manage.service'; @@ -21,11 +21,11 @@ interface FontDocument extends Document { * using FontFace. * Browser support might not be perfect yet. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class LoadFontService { - public constructor(private mediaManageService: MediaManageService) { + private mediaManageService = inject(MediaManageService); + + public constructor() { this.loadCustomFont(); } diff --git a/client/src/app/site/pages/meetings/services/main-menu.service.ts b/client/src/app/site/pages/meetings/services/main-menu.service.ts index 7f70b81345..55a47300c8 100644 --- a/client/src/app/site/pages/meetings/services/main-menu.service.ts +++ b/client/src/app/site/pages/meetings/services/main-menu.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { Subject } from 'rxjs'; import { Permission } from '../../../../domain/definitions/permission'; @@ -12,9 +12,7 @@ export interface MainMenuEntry extends BaseMenuEntry {} /** * Collects main menu entries and provides them to the main menu component. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class MainMenuService { /** * A list of sorted entries. @@ -34,8 +32,6 @@ export class MainMenuService { return this._entries; } - public constructor() {} - /** * Adds entries to the mainmenu. * @param entries The entries to add diff --git a/client/src/app/site/pages/meetings/services/media-manage.service.ts b/client/src/app/site/pages/meetings/services/media-manage.service.ts index d453145893..b8504f7301 100644 --- a/client/src/app/site/pages/meetings/services/media-manage.service.ts +++ b/client/src/app/site/pages/meetings/services/media-manage.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { FONT_PLACES, @@ -17,9 +17,7 @@ import { BehaviorSubject, distinctUntilChanged, merge, Observable } from 'rxjs'; import { ViewMediafile, ViewMeetingMediafile } from '../pages/mediafiles'; import { ActiveMeetingService } from './active-meeting.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MediaManageService { public allLogoPlaces = LOGO_PLACES; @@ -28,12 +26,12 @@ export class MediaManageService { private readonly logoUrlSubjects: Partial>> = {}; private readonly fontUrlSubjects: Partial>> = {}; - public constructor( - private activeMeetingService: ActiveMeetingService, - private mediaAdapter: MeetingMediaAdapterService, - private mediaRepo: MediafileRepositoryService, - private meetingMediaRepo: MeetingMediafileRepositoryService - ) { + private activeMeetingService = inject(ActiveMeetingService); + private mediaAdapter = inject(MeetingMediaAdapterService); + private mediaRepo = inject(MediafileRepositoryService); + private meetingMediaRepo = inject(MeetingMediafileRepositoryService); + + public constructor() { merge(this.activeMeetingService.meetingObservable, this.mediaRepo.getViewModelListUnsafeObservable()).subscribe( _ => { for (const place of Object.keys(this.logoUrlSubjects)) { diff --git a/client/src/app/site/pages/meetings/services/meeting-collection-mapper.service.ts b/client/src/app/site/pages/meetings/services/meeting-collection-mapper.service.ts index 8834610e78..e527d7763c 100644 --- a/client/src/app/site/pages/meetings/services/meeting-collection-mapper.service.ts +++ b/client/src/app/site/pages/meetings/services/meeting-collection-mapper.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Fqid } from '@app/domain/definitions/key-types'; import { BaseMeetingRelatedRepository } from '@app/gateways/repositories/base-meeting-related-repository'; import { BaseViewModel } from '@app/site/base/base-view-model'; @@ -10,16 +10,18 @@ import { import { CollectionMapper } from '@app/site/services/collection-mapper.service/collection-mapper'; import { BehaviorSubject, Observable } from 'rxjs'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MeetingCollectionMapperService extends CollectionMapperService implements CollectionMapper { private readonly _meetingRepositoriesSubject = new BehaviorSubject[]>([]); - public constructor(private collectionMapperService: CollectionMapperService) { + private collectionMapperService = inject(CollectionMapperService); + + public constructor() { super(); - collectionMapperService.getAllCollectionMaps().forEach(mapping => this.registerMeetingRepository(mapping)); - collectionMapperService.afterRepositoryRegistered.subscribe(mapping => this.registerMeetingRepository(mapping)); + this.collectionMapperService.getAllCollectionMaps().forEach(mapping => this.registerMeetingRepository(mapping)); + this.collectionMapperService.afterRepositoryRegistered.subscribe(mapping => + this.registerMeetingRepository(mapping) + ); } public getAllRepositoriesObservable(): Observable[]> { diff --git a/client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.ts b/client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.ts index 38f492fc56..dd190ad401 100644 --- a/client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.ts +++ b/client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; import { Router } from '@angular/router'; @@ -10,9 +10,7 @@ import { ActiveMeetingService } from './active-meeting.service'; import { ActiveMeetingIdService } from './active-meeting-id.service'; import { MeetingSettingsService } from './meeting-settings.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MeetingComponentServiceCollectorService { public get titleService(): Title { return this.componentServiceCollector.titleService; diff --git a/client/src/app/site/pages/meetings/services/meeting-controller-service-collector.service.ts b/client/src/app/site/pages/meetings/services/meeting-controller-service-collector.service.ts index abfb110737..333722204d 100644 --- a/client/src/app/site/pages/meetings/services/meeting-controller-service-collector.service.ts +++ b/client/src/app/site/pages/meetings/services/meeting-controller-service-collector.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ControllerServiceCollectorService } from '@app/site/services/controller-service-collector.service'; import { DataStoreService } from '@app/site/services/data-store.service'; import { RelationManagerService } from '@app/site/services/relation-manager.service'; @@ -10,9 +10,7 @@ import { ActiveMeetingIdService } from './active-meeting-id.service'; import { MeetingCollectionMapperService } from './meeting-collection-mapper.service'; import { MeetingSettingsService } from './meeting-settings.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MeetingControllerServiceCollectorService { public get translate(): TranslateService { return this.controllerServiceCollector.translate; @@ -30,11 +28,9 @@ export class MeetingControllerServiceCollectorService { return this.controllerServiceCollector.viewModelStoreService; } - public constructor( - private controllerServiceCollector: ControllerServiceCollectorService, - public activeMeetingIdService: ActiveMeetingIdService, - public activeMeetingService: ActiveMeetingService, - public collectionMapperService: MeetingCollectionMapperService, - public meetingSettingsService: MeetingSettingsService - ) {} + private controllerServiceCollector = inject(ControllerServiceCollectorService); + public activeMeetingIdService = inject(ActiveMeetingIdService); + public activeMeetingService = inject(ActiveMeetingService); + public collectionMapperService = inject(MeetingCollectionMapperService); + public meetingSettingsService = inject(MeetingSettingsService); } diff --git a/client/src/app/site/pages/meetings/services/meeting-controller.service.ts b/client/src/app/site/pages/meetings/services/meeting-controller.service.ts index 943b843adf..ce891c2128 100644 --- a/client/src/app/site/pages/meetings/services/meeting-controller.service.ts +++ b/client/src/app/site/pages/meetings/services/meeting-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Injector } from '@angular/core'; +import { inject, Injector, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Action } from '@app/gateways/actions'; import { ImportMeeting } from '@app/gateways/repositories/meeting-repository.service'; @@ -20,9 +20,7 @@ export interface MeetingUserModifiedFields { removedAdmins?: ViewUser[]; } -@Injectable({ - providedIn: `root` -}) +@Service() export class MeetingControllerService extends BaseController { private get pointOfOrdercategoryRepo(): PointOfOrderCategoryRepositoryService { if (!this._pointOfOrdercategoryRepo) { @@ -33,11 +31,12 @@ export class MeetingControllerService extends BaseController> = {}; + private activeMeetingService = inject(ActiveMeetingService); /** * Listen for changes of setting variables. */ - public constructor( - private activeMeetingService: ActiveMeetingService, - customTranslationService: CustomTranslationService - ) { + public constructor() { + const customTranslationService = inject(CustomTranslationService); this.activeMeetingService.meetingObservable.subscribe(meeting => { if (meeting) { for (const key of Object.keys(this.settingSubjects)) { diff --git a/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.ts b/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.ts index a24c6d3e95..8645ecde9a 100644 --- a/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.ts +++ b/client/src/app/site/pages/meetings/services/sequential-number-mapping.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Collection, Id } from '@app/domain/definitions/key-types'; import { HasMeetingId, HasSequentialNumber, isSequentialNumberHaving } from '@app/domain/interfaces'; import { Assignment } from '@app/domain/models/assignments/assignment'; @@ -40,7 +40,7 @@ interface SequentialNumberMappingConfig { meetingId: number; } -@Injectable({ providedIn: `root` }) +@Service() export class SequentialNumberMappingService { private _mutex = new Mutex(); private get activeMeetingId(): Id { @@ -56,7 +56,8 @@ export class SequentialNumberMappingService { private autoupdateService = inject(AutoupdateService); private modelRequestBuilder = inject(ModelRequestBuilderService); - public constructor(collectionMapperService: MeetingCollectionMapperService) { + public constructor() { + const collectionMapperService = inject(MeetingCollectionMapperService); collectionMapperService.getAllRepositoriesObservable().subscribe(repositories => { this._repositories = repositories; this.updateRepositoriesSubscriptions(); diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts index 88a0e4ef40..12da57adb1 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { BaseBackendImportService } from '@app/site/base/base-import.service/base-backend-import.service'; import { ImportServiceCollectorService } from '@app/site/services/import-service-collector.service'; import { BackendImportRawPreview } from '@app/ui/modules/import-list/definitions/backend-import-preview'; @@ -7,9 +7,7 @@ import { _ } from '@ngx-translate/core'; import { AccountExportService } from '../../../../services/account-export.service'; import { AccountControllerService } from '../../../../services/common/account-controller.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class AccountImportService extends BaseBackendImportService { /** * The minimimal number of header entries needed to successfully create an entry @@ -33,11 +31,11 @@ export class AccountImportService extends BaseBackendImportService { warning: _(`Accounts with warnings: affected cells will be skipped`) }; - public constructor( - importServiceCollector: ImportServiceCollectorService, - private repo: AccountControllerService, - private exporter: AccountExportService - ) { + private repo = inject(AccountControllerService); + private exporter = inject(AccountExportService); + + public constructor() { + const importServiceCollector = inject(ImportServiceCollectorService); super(importServiceCollector); } diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-search/account-list-search.service.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-search/account-list-search.service.ts index 036b19def5..e9ebdfbded 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-search/account-list-search.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-search/account-list-search.service.ts @@ -1,10 +1,8 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { ListSearchService } from '@app/ui/modules/list/services/list-search.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class AccountListSearchService extends ListSearchService { public constructor() { super( diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service.ts b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service.ts index 6be5a56160..20757299da 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/account-list/services/account-list-sort.service/account-sort.service.ts @@ -1,13 +1,11 @@ -import { Injectable, ProviderToken } from '@angular/core'; +import { ProviderToken, Service } from '@angular/core'; import { BaseRepository } from '@app/gateways/repositories/base-repository'; import { UserRepositoryService } from '@app/gateways/repositories/users'; import { BaseSortListService, OsSortingOption } from '@app/site/base/base-sort.service'; import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; import { _ } from '@ngx-translate/core'; -@Injectable({ - providedIn: `root` -}) +@Service() export class AccountSortService extends BaseSortListService { protected storageKey = `MemberList`; diff --git a/client/src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service.ts b/client/src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service.ts index ec75c6312c..c123bb9a31 100644 --- a/client/src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/pages/gender/services/gender-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Gender } from '@app/domain/models/gender/gender'; import { GenderRepositoryService } from '@app/gateways/repositories/gender/gender-repository.service'; @@ -7,14 +7,13 @@ import { ControllerServiceCollectorService } from '@app/site/services/controller import { ViewGender } from '../view-models/view-gender'; -@Injectable({ - providedIn: `root` -}) +@Service() export class GenderControllerService extends BaseController { - public constructor( - controllerServiceCollector: ControllerServiceCollectorService, - protected override repo: GenderRepositoryService - ) { + protected override repo: GenderRepositoryService; + + public constructor() { + const controllerServiceCollector = inject(ControllerServiceCollectorService); + const repo = inject(GenderRepositoryService); super(controllerServiceCollector, Gender, repo); } diff --git a/client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.ts b/client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.ts index 4f0163b34b..29ebbb97d0 100644 --- a/client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/services/account-export.service/account-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { UserExport } from '@app/domain/models/users/user.export'; import { CsvExportForBackendService } from '@app/gateways/export/csv-export.service/csv-export-for-backend.service'; import { ViewUser } from '@app/site/pages/meetings/view-models/view-user'; @@ -7,14 +7,10 @@ import { TranslateService } from '@ngx-translate/core'; import { AccountCsvExportExample } from '../../export/csv-export-example'; import { accountColumns } from '../../pages/account-import/definitions'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class AccountExportService { - public constructor( - private csvExportService: CsvExportForBackendService, - private translate: TranslateService - ) {} + private csvExportService = inject(CsvExportForBackendService); + private translate = inject(TranslateService); public downloadCsvImportExample(): void { this.csvExportService.dummyCSVExport( diff --git a/client/src/app/site/pages/organization/pages/accounts/services/common/account-controller.service.ts b/client/src/app/site/pages/organization/pages/accounts/services/common/account-controller.service.ts index a059f0357b..5e3ddfe61c 100644 --- a/client/src/app/site/pages/organization/pages/accounts/services/common/account-controller.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/services/common/account-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { OML } from '@app/domain/definitions/organization-permission'; import { Identifiable } from '@app/domain/interfaces'; @@ -16,19 +16,18 @@ import { PromptService } from '@app/ui/modules/prompt-dialog'; import { _ } from '@ngx-translate/core'; import { firstValueFrom, map, Observable } from 'rxjs'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class AccountControllerService extends BaseController { private _committee_users_set = new Set(); - public constructor( - controllerServiceCollector: ControllerServiceCollectorService, - protected override repo: UserRepositoryService, - private userDeleteDialog: UserDeleteDialogService, - private prompt: PromptService, - private operator: OperatorService - ) { + protected override repo: UserRepositoryService; + private userDeleteDialog = inject(UserDeleteDialogService); + private prompt = inject(PromptService); + private operator = inject(OperatorService); + + public constructor() { + const controllerServiceCollector = inject(ControllerServiceCollectorService); + const repo = inject(UserRepositoryService); super(controllerServiceCollector, User, repo); this.operator.user.committee_managements$.subscribe(committees => { const userIdsSet = new Set(committees.flatMap(committee => committee.user_ids ?? [])); diff --git a/client/src/app/site/pages/organization/pages/accounts/services/common/account-filter.service.ts b/client/src/app/site/pages/organization/pages/accounts/services/common/account-filter.service.ts index 9f488b401c..841d43929a 100644 --- a/client/src/app/site/pages/organization/pages/accounts/services/common/account-filter.service.ts +++ b/client/src/app/site/pages/organization/pages/accounts/services/common/account-filter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { OML } from '@app/domain/definitions/organization-permission'; import { BaseFilterListService, OsFilter } from '@app/site/base/base-filter.service'; @@ -15,9 +15,7 @@ import { GenderControllerService } from '../../pages/gender/services/gender-cont type Email = string; type Name = string; -@Injectable({ - providedIn: `root` -}) +@Service() export class AccountFilterService extends BaseFilterListService { protected storageKey = `MemberList`; @@ -59,20 +57,20 @@ export class AccountFilterService extends BaseFilterListService { ); } - public constructor( - store: ActiveFiltersService, - private operator: OperatorService, - private controller: UserControllerService, - private meetingRepo: MeetingControllerService, - private genderRepo: GenderControllerService - ) { + private operator = inject(OperatorService); + private controller = inject(UserControllerService); + private meetingRepo = inject(MeetingControllerService); + private genderRepo = inject(GenderControllerService); + + public constructor() { + const store = inject(ActiveFiltersService); super(store); this.controller.getViewModelListObservable().subscribe(users => { this.updateUserMaps(users); }); this.updateFilterForRepo({ - repo: genderRepo, + repo: this.genderRepo, filter: this.genderFilterOption, noneOptionLabel: _(`not specified`) }); diff --git a/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.ts b/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.ts index 56ac4a93c9..2140b22a8d 100644 --- a/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/modules/services/meeting.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Router } from '@angular/router'; import { FileExportService } from '@app/gateways/export/file-export.service/file-export.service'; import { ExportMeetingPresenterService } from '@app/gateways/presenter/export-meeting-presenter.service'; @@ -6,9 +6,7 @@ import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; import { AccountFilterService } from '../../../accounts/services/common/account-filter.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MeetingService { private router = inject(Router); private accountFilterService = inject(AccountFilterService); diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts index 55e60ea8fe..91eb7884e5 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-import/services/committee-import.service/committee-import.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { CsvExportForBackendService } from '@app/gateways/export/csv-export.service/csv-export-for-backend.service'; import { BaseBackendImportService } from '@app/site/base/base-import.service/base-backend-import.service'; import { ImportServiceCollectorService } from '@app/site/services/import-service-collector.service'; @@ -9,9 +9,7 @@ import { COMMITTEE_CSV_EXPORT_EXAMPLE } from '../../../../export'; import { CommitteeControllerService } from '../../../../services/committee-controller.service'; import { committeeHeadersAndVerboseNames } from '../../definitions'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class CommitteeImportService extends BaseBackendImportService { public override errorList = { Duplicates: _(`This committee already exists`) @@ -30,7 +28,8 @@ export class CommitteeImportService extends BaseBackendImportService { private exporter = inject(CsvExportForBackendService); private repo = inject(CommitteeControllerService); - public constructor(importServiceCollector: ImportServiceCollectorService) { + public constructor() { + const importServiceCollector = inject(ImportServiceCollectorService); super(importServiceCollector); } diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.ts index d71171f746..8a28a9549a 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.ts @@ -1,18 +1,14 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { CsvColumnsDefinition } from '@app/gateways/export/csv-export.service'; import { CsvExportForBackendService } from '@app/gateways/export/csv-export.service/csv-export-for-backend.service'; import { TranslateService } from '@ngx-translate/core'; import { ViewCommittee } from '../../../../view-models/view-committee'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class CommitteeExportService { - public constructor( - private translate: TranslateService, - private csvExport: CsvExportForBackendService - ) {} + private translate = inject(TranslateService); + private csvExport = inject(CsvExportForBackendService); public export(committees: ViewCommittee[]): void { const properties: CsvColumnsDefinition = [ diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-filter.service/committee-filter.service.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-filter.service/committee-filter.service.ts index 5917a0ac0a..4ba1ea2dec 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-filter.service/committee-filter.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-filter.service/committee-filter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { BaseFilterListService, OsFilter } from '@app/site/base/base-filter.service'; import { OrganizationTagControllerService } from '@app/site/pages/organization/pages/organization-tags/services/organization-tag-controller.service'; import { ActiveFiltersService } from '@app/site/services/active-filters.service'; @@ -6,9 +6,7 @@ import { _ } from '@ngx-translate/core'; import { ViewCommittee } from '../../../../view-models'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class CommitteeFilterService extends BaseFilterListService { protected storageKey = `CommitteeList`; @@ -19,7 +17,9 @@ export class CommitteeFilterService extends BaseFilterListService options: [] }; - public constructor(organizationTagRepo: OrganizationTagControllerService, store: ActiveFiltersService) { + public constructor() { + const organizationTagRepo = inject(OrganizationTagControllerService); + const store = inject(ActiveFiltersService); super(store); this.updateFilterForRepo({ repo: organizationTagRepo, diff --git a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service.ts b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service.ts index a9c03e1694..45797ac54a 100644 --- a/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-sort.service/committee-sort.service.ts @@ -1,4 +1,4 @@ -import { Injectable, ProviderToken } from '@angular/core'; +import { ProviderToken, Service } from '@angular/core'; import { BaseRepository } from '@app/gateways/repositories/base-repository'; import { CommitteeRepositoryService } from '@app/gateways/repositories/committee-repository.service'; import { BaseSortListService, OsSortingOption } from '@app/site/base/base-sort.service'; @@ -6,9 +6,7 @@ import { _ } from '@ngx-translate/core'; import { ViewCommittee } from '../../../../view-models'; -@Injectable({ - providedIn: `root` -}) +@Service() export class CommitteeSortService extends BaseSortListService { protected storageKey = `CommitteeList`; diff --git a/client/src/app/site/pages/organization/pages/committees/services/committee-controller.service.ts b/client/src/app/site/pages/organization/pages/committees/services/committee-controller.service.ts index d517f31fe7..986ca138e2 100644 --- a/client/src/app/site/pages/organization/pages/committees/services/committee-controller.service.ts +++ b/client/src/app/site/pages/organization/pages/committees/services/committee-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Action } from '@app/gateways/actions'; import { BackendImportRawPreview } from '@app/ui/modules/import-list/definitions/backend-import-preview'; @@ -10,14 +10,13 @@ import { BaseController } from '../../../../../base/base-controller'; import { ControllerServiceCollectorService } from '../../../../../services/controller-service-collector.service'; import { ViewCommittee } from '../view-models'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class CommitteeControllerService extends BaseController { - public constructor( - repositoryServiceCollector: ControllerServiceCollectorService, - protected override repo: CommitteeRepositoryService - ) { + protected override repo: CommitteeRepositoryService; + + public constructor() { + const repositoryServiceCollector = inject(ControllerServiceCollectorService); + const repo = inject(CommitteeRepositoryService); super(repositoryServiceCollector, Committee, repo); } diff --git a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/services/theme-builder-dialog.service.ts b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/services/theme-builder-dialog.service.ts index 1609a9433e..2c6f6d4259 100644 --- a/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/services/theme-builder-dialog.service.ts +++ b/client/src/app/site/pages/organization/pages/designs/modules/theme-builder-dialog/services/theme-builder-dialog.service.ts @@ -1,11 +1,9 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; import { BaseDialogService } from '@app/ui/base/base-dialog-service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class ThemeBuilderDialogService extends BaseDialogService { public async open(data: any): Promise> { const module = await import(`../theme-builder-dialog.module`); diff --git a/client/src/app/site/pages/organization/pages/designs/services/theme-controller.service.ts b/client/src/app/site/pages/organization/pages/designs/services/theme-controller.service.ts index 3f57ffa90b..16b67f566c 100644 --- a/client/src/app/site/pages/organization/pages/designs/services/theme-controller.service.ts +++ b/client/src/app/site/pages/organization/pages/designs/services/theme-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Identifiable } from '@app/domain/interfaces'; import { Theme } from '@app/domain/models/theme/theme'; @@ -9,15 +9,14 @@ import { ControllerServiceCollectorService } from '@app/site/services/controller import { ViewTheme } from '../view-models'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class ThemeControllerService extends BaseController { - public constructor( - controllerServiceCollector: ControllerServiceCollectorService, - protected override repo: ThemeRepositoryService, - private orgaRepo: OrganizationControllerService - ) { + protected override repo: ThemeRepositoryService; + private orgaRepo = inject(OrganizationControllerService); + + public constructor() { + const controllerServiceCollector = inject(ControllerServiceCollectorService); + const repo = inject(ThemeRepositoryService); super(controllerServiceCollector, Theme, repo); } diff --git a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-export.service.ts b/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-export.service.ts index 7da39157d3..3843459626 100644 --- a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-export.service.ts +++ b/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-export.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { CsvColumnDefinitionProperty, CsvColumnsDefinition } from '@app/gateways/export/csv-export.service'; import { CsvExportForBackendService } from '@app/gateways/export/csv-export.service/csv-export-for-backend.service'; import { MeetingControllerService } from '@app/site/pages/meetings/services/meeting-controller.service'; @@ -6,11 +6,7 @@ import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; import { _ } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core'; -import { MeetingListServiceModule } from './meeting-list-service.module'; - -@Injectable({ - providedIn: MeetingListServiceModule -}) +@Service() export class MeetingCsvExportService { private meetingHeadersAndVerboseNames = { name: _(`Meeting`), @@ -29,11 +25,9 @@ export class MeetingCsvExportService { motionsAmount: _(`Motions`) }; - public constructor( - private csvExport: CsvExportForBackendService, - private translate: TranslateService, - private meetingRepo: MeetingControllerService - ) {} + private csvExport = inject(CsvExportForBackendService); + private translate = inject(TranslateService); + private meetingRepo = inject(MeetingControllerService); public export(meetings: ViewMeeting[]): void { this.csvExport.export( diff --git a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-filter/meeting-list-filter.service.ts b/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-filter/meeting-list-filter.service.ts index c626733edd..9e4418f470 100644 --- a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-filter/meeting-list-filter.service.ts +++ b/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-filter/meeting-list-filter.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { OML } from '@app/domain/definitions/organization-permission'; import { BaseFilterListService, OsFilter } from '@app/site/base/base-filter.service'; import { RelatedTime, ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; @@ -8,9 +8,7 @@ import { _ } from '@ngx-translate/core'; import { OrganizationTagControllerService } from '../../../../../organization-tags/services/organization-tag-controller.service'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class MeetingListFilterService extends BaseFilterListService { protected storageKey = `MeetingList`; @@ -21,11 +19,11 @@ export class MeetingListFilterService extends BaseFilterListService options: [] }; - public constructor( - store: ActiveFiltersService, - private operator: OperatorService, - organizationTagRepo: OrganizationTagControllerService - ) { + private operator = inject(OperatorService); + + public constructor() { + const store = inject(ActiveFiltersService); + const organizationTagRepo = inject(OrganizationTagControllerService); super(store); this.updateFilterForRepo({ repo: organizationTagRepo, diff --git a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-sort/meeting-list-sort.service.ts b/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-sort/meeting-list-sort.service.ts index 2884290aee..6a63ba0f54 100644 --- a/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-sort/meeting-list-sort.service.ts +++ b/client/src/app/site/pages/organization/pages/orga-meetings/pages/meeting-list/services/meeting-list-sort/meeting-list-sort.service.ts @@ -1,13 +1,11 @@ -import { Injectable, ProviderToken } from '@angular/core'; +import { ProviderToken, Service } from '@angular/core'; import { BaseRepository } from '@app/gateways/repositories/base-repository'; import { MeetingRepositoryService } from '@app/gateways/repositories/meeting-repository.service'; import { BaseSortListService, OsSortingOption } from '@app/site/base/base-sort.service'; import { ViewMeeting } from '@app/site/pages/meetings/view-models/view-meeting'; import { _ } from '@ngx-translate/core'; -@Injectable({ - providedIn: `root` -}) +@Service() export class MeetingListSortService extends BaseSortListService { protected storageKey = `MeetingList`; diff --git a/client/src/app/site/pages/organization/services/organization-controller.service.ts b/client/src/app/site/pages/organization/services/organization-controller.service.ts index e1f977bc2a..ae579952f4 100644 --- a/client/src/app/site/pages/organization/services/organization-controller.service.ts +++ b/client/src/app/site/pages/organization/services/organization-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Organization } from '../../../../domain/models/organizations/organization'; import { OrganizationRepositoryService } from '../../../../gateways/repositories/organization-repository.service'; @@ -6,14 +6,13 @@ import { BaseController } from '../../../base/base-controller'; import { ControllerServiceCollectorService } from '../../../services/controller-service-collector.service'; import { ViewOrganization } from '../view-models/view-organization'; -@Injectable({ - providedIn: `root` -}) +@Service() export class OrganizationControllerService extends BaseController { - public constructor( - repositoryServiceCollector: ControllerServiceCollectorService, - protected override repo: OrganizationRepositoryService - ) { + protected override repo: OrganizationRepositoryService; + + public constructor() { + const repositoryServiceCollector = inject(ControllerServiceCollectorService); + const repo = inject(OrganizationRepositoryService); super(repositoryServiceCollector, Organization, repo); } diff --git a/client/src/app/site/pages/organization/services/organization-settings.service.ts b/client/src/app/site/pages/organization/services/organization-settings.service.ts index c04e51f229..c3d0f162d0 100644 --- a/client/src/app/site/pages/organization/services/organization-settings.service.ts +++ b/client/src/app/site/pages/organization/services/organization-settings.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { OrganizationRepositoryService } from '@app/gateways/repositories/organization-repository.service'; import { BehaviorSubject, combineLatest, filter, map, Observable } from 'rxjs'; @@ -6,9 +6,7 @@ import { OrganizationSetting } from '../../../../domain/models/organizations/org import { ViewOrganization } from '../view-models/view-organization'; import { ORGANIZATION_ID, OrganizationService } from './organization.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class OrganizationSettingsService { /** * Stores a subject per key. Values are published, if the DataStore gets an update. @@ -17,18 +15,17 @@ export class OrganizationSettingsService { private hasDataSubject = new BehaviorSubject(false); + private organization = inject(OrganizationService); + private repo = inject(OrganizationRepositoryService); /** * Listen for changes of setting variables. */ - public constructor( - private organization: OrganizationService, - private repo: OrganizationRepositoryService - ) { + public constructor() { this.repo .getModifiedIdsObservable() .subscribe(ids => this.hasDataSubject.next(this.hasDataSubject.value || ids.includes(ORGANIZATION_ID))); - organization.organizationObservable.subscribe(activeOrganization => { + this.organization.organizationObservable.subscribe(activeOrganization => { if (activeOrganization) { for (const key of Object.keys(this.settingSubjects)) { this.settingSubjects[key].next(activeOrganization[key as keyof ViewOrganization] as any); diff --git a/client/src/app/site/pages/organization/services/organization.service.ts b/client/src/app/site/pages/organization/services/organization.service.ts index 0e79306deb..abfd4dc6a4 100644 --- a/client/src/app/site/pages/organization/services/organization.service.ts +++ b/client/src/app/site/pages/organization/services/organization.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ModelRequestService } from '@app/site/services/model-request.service'; import { BehaviorSubject, Observable } from 'rxjs'; @@ -13,9 +13,7 @@ import { ViewOrganization } from '../view-models/view-organization'; */ export const ORGANIZATION_ID = 1; -@Injectable({ - providedIn: `root` -}) +@Service() export class OrganizationService { public get organizationObservable(): Observable { return this.organizationSubject; @@ -35,11 +33,11 @@ export class OrganizationService { private _hasInitiated = false; - public constructor( - private repo: OrganizationRepositoryService, - private modelRequestService: ModelRequestService, - lifecycle: LifecycleService - ) { + private repo = inject(OrganizationRepositoryService); + private modelRequestService = inject(ModelRequestService); + + public constructor() { + const lifecycle = inject(LifecycleService); lifecycle.openslidesBooted.subscribe(async () => await this.setupModelSubscription()); lifecycle.openslidesShutdowned.subscribe(() => this.destroy()); } diff --git a/client/src/app/site/services/active-filters.service.ts b/client/src/app/site/services/active-filters.service.ts index 040294110a..5c65b57c95 100644 --- a/client/src/app/site/services/active-filters.service.ts +++ b/client/src/app/site/services/active-filters.service.ts @@ -1,18 +1,14 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { StorageService } from '@app/gateways/storage.service'; import { ActiveMeetingIdService } from '@app/site/pages/meetings/services/active-meeting-id.service'; import { ActiveFiltersStoreService } from '@app/ui/modules/list/definitions'; import { OsFilter } from '../base/base-filter.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ActiveFiltersService implements ActiveFiltersStoreService { - public constructor( - private store: StorageService, - private activeMeetingIdService: ActiveMeetingIdService - ) {} + private store = inject(StorageService); + private activeMeetingIdService = inject(ActiveMeetingIdService); public async save(storageKey: string, filterDefinitions: OsFilter[]): Promise { return await this.store.set(this.calcStorageKey(storageKey), filterDefinitions); diff --git a/client/src/app/site/services/auth-check.service.ts b/client/src/app/site/services/auth-check.service.ts index d4e71f59ca..ef4a9b642c 100644 --- a/client/src/app/site/services/auth-check.service.ts +++ b/client/src/app/site/services/auth-check.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Data } from '@angular/router'; import { Id } from '@app/domain/definitions/key-types'; import { CML, OML } from '@app/domain/definitions/organization-permission'; @@ -15,9 +15,7 @@ import { ModelRequestBuilderService } from './model-request-builder'; import { OpenSlidesRouterService } from './openslides-router.service'; import { OperatorService } from './operator.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class AuthCheckService { /** * The last url to be approved by the permission guard, will be automatically emptied after the first read. @@ -34,16 +32,14 @@ export class AuthCheckService { private _lastSuccessfulUrl: string | null = null; - public constructor( - private operator: OperatorService, - private activeMeeting: ActiveMeetingService, - private meetingRepo: MeetingRepositoryService, - private meetingSettingsService: MeetingSettingsService, - private autoupdate: AutoupdateService, - private cookie: CookieService, - private modelRequestBuilder: ModelRequestBuilderService, - private osRouter: OpenSlidesRouterService - ) {} + private operator = inject(OperatorService); + private activeMeeting = inject(ActiveMeetingService); + private meetingRepo = inject(MeetingRepositoryService); + private meetingSettingsService = inject(MeetingSettingsService); + private autoupdate = inject(AutoupdateService); + private cookie = inject(CookieService); + private modelRequestBuilder = inject(ModelRequestBuilderService); + private osRouter = inject(OpenSlidesRouterService); public async isAuthorized(routeData: Data): Promise { const basePerm: Permission[] = routeData[`meetingPermissions`]; diff --git a/client/src/app/site/services/auth-token.service.ts b/client/src/app/site/services/auth-token.service.ts index b2385b40c6..990b2cacdb 100644 --- a/client/src/app/site/services/auth-token.service.ts +++ b/client/src/app/site/services/auth-token.service.ts @@ -1,11 +1,9 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; import { AuthToken } from '../../domain/interfaces/auth-token'; -@Injectable({ - providedIn: `root` -}) +@Service() export class AuthTokenService { public get rawAccessToken(): string | null { return this._rawAccessToken; diff --git a/client/src/app/site/services/auth.service.ts b/client/src/app/site/services/auth.service.ts index 40a27997d4..2acd9d085f 100644 --- a/client/src/app/site/services/auth.service.ts +++ b/client/src/app/site/services/auth.service.ts @@ -1,4 +1,4 @@ -import { EventEmitter, Injectable } from '@angular/core'; +import { EventEmitter, inject, Service } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { SharedWorkerService } from '@app/openslides-main-module/services/shared-worker.service'; import { CookieService } from 'ngx-cookie-service'; @@ -11,9 +11,7 @@ import { AuthTokenService } from './auth-token.service'; import { DataStoreService } from './data-store.service'; import { LifecycleService } from './lifecycle.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class AuthService { public get authTokenObservable(): Observable { return this._authTokenSubject; @@ -44,16 +42,16 @@ export class AuthService { private readonly _logoutEvent = new EventEmitter(); private readonly _loginEvent = new EventEmitter(); - public constructor( - private lifecycleService: LifecycleService, - private router: Router, - private activatedRoute: ActivatedRoute, - private authAdapter: AuthAdapterService, - private authTokenService: AuthTokenService, - private sharedWorker: SharedWorkerService, - private cookie: CookieService, - private DS: DataStoreService - ) { + private lifecycleService = inject(LifecycleService); + private router = inject(Router); + private activatedRoute = inject(ActivatedRoute); + private authAdapter = inject(AuthAdapterService); + private authTokenService = inject(AuthTokenService); + private sharedWorker = inject(SharedWorkerService); + private cookie = inject(CookieService); + private DS = inject(DataStoreService); + + public constructor() { this.authTokenService.accessTokenObservable.subscribe(token => { this._authTokenSubject.next(token); }); diff --git a/client/src/app/site/services/autoupdate/autoupdate-communication.service.ts b/client/src/app/site/services/autoupdate/autoupdate-communication.service.ts index 43244e1ffa..67b346d94b 100644 --- a/client/src/app/site/services/autoupdate/autoupdate-communication.service.ts +++ b/client/src/app/site/services/autoupdate/autoupdate-communication.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Id } from '@app/domain/definitions/key-types'; import { ModelRequest } from '@app/domain/interfaces/model-request'; @@ -31,9 +31,7 @@ import { AuthTokenService } from '../auth-token.service'; import { ConnectionStatusService } from '../connection-status.service'; import { SUBSCRIPTION_SUFFIX } from '../model-request.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class AutoupdateCommunicationService { private autoupdateDataObservable: Observable; private openResolvers = new Map) => void)[]>(); @@ -43,17 +41,17 @@ export class AutoupdateCommunicationService { private tryReconnectOpen = false; private subscriptionsWithData = new Set(); - public constructor( - private authTokenService: AuthTokenService, - private authService: AuthService, - private sharedWorker: SharedWorkerService, - private endpointService: HttpStreamEndpointService, - private matSnackBar: MatSnackBar, - private translate: TranslateService, - private connectionStatusService: ConnectionStatusService, - private updateService: UpdateService, - private headbarService: GlobalHeadbarService - ) { + private authTokenService = inject(AuthTokenService); + private authService = inject(AuthService); + private sharedWorker = inject(SharedWorkerService); + private endpointService = inject(HttpStreamEndpointService); + private matSnackBar = inject(MatSnackBar); + private translate = inject(TranslateService); + private connectionStatusService = inject(ConnectionStatusService); + private updateService = inject(UpdateService); + private headbarService = inject(GlobalHeadbarService); + + public constructor() { this.autoupdateDataObservable = new Observable(dataSubscription => { this.sharedWorker.listenTo(`autoupdate`).subscribe(msg => { switch (msg?.action) { diff --git a/client/src/app/site/services/autoupdate/autoupdate.service.ts b/client/src/app/site/services/autoupdate/autoupdate.service.ts index 7d8d143afc..03d5844013 100644 --- a/client/src/app/site/services/autoupdate/autoupdate.service.ts +++ b/client/src/app/site/services/autoupdate/autoupdate.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ModelRequest } from '@app/domain/interfaces/model-request'; import { _ } from '@ngx-translate/core'; @@ -64,22 +64,20 @@ export const OUT_OF_SYNC_BANNER: BannerDefinition = { export const AU_PAUSE_ON_INACTIVITY_TIMEOUT = 5 * 60 * 1000; // 5 Minutes -@Injectable({ - providedIn: `root` -}) +@Service() export class AutoupdateService { private _activeRequestObjects: AutoupdateSubscriptionMap = {}; private _mutex = new Mutex(); private _currentQueryParams: QueryParams | null = null; private _resolveDataReceived: Record void)[]> = []; - public constructor( - private httpEndpointService: HttpStreamEndpointService, - private viewmodelStoreUpdate: ViewModelStoreUpdateService, - private communication: AutoupdateCommunicationService, - private bannerService: BannerService, - private visibilityService: WindowVisibilityService - ) { + private httpEndpointService = inject(HttpStreamEndpointService); + private viewmodelStoreUpdate = inject(ViewModelStoreUpdateService); + private communication = inject(AutoupdateCommunicationService); + private bannerService = inject(BannerService); + private visibilityService = inject(WindowVisibilityService); + + public constructor() { this.setAutoupdateConfig(null); this.httpEndpointService.registerEndpoint( AUTOUPDATE_DEFAULT_ENDPOINT, diff --git a/client/src/app/site/services/collection-mapper.service/collection-mapper.service.ts b/client/src/app/site/services/collection-mapper.service/collection-mapper.service.ts index e886e29037..85a98e75fc 100644 --- a/client/src/app/site/services/collection-mapper.service/collection-mapper.service.ts +++ b/client/src/app/site/services/collection-mapper.service/collection-mapper.service.ts @@ -1,4 +1,4 @@ -import { EventEmitter, Injectable } from '@angular/core'; +import { EventEmitter, Service } from '@angular/core'; import { BaseModel, ModelConstructor } from '@app/domain/models/base/base-model'; import { BaseRepository } from '@app/gateways/repositories/base-repository'; import { BaseViewModel, ViewModelConstructor } from '@app/site/base/base-view-model'; @@ -7,9 +7,7 @@ import { BehaviorSubject, Observable } from 'rxjs'; import { CollectionMapper } from './collection-mapper'; import { CollectionMappedTypes, CollectionType } from './definitions'; -@Injectable({ - providedIn: `root` -}) +@Service() export class CollectionMapperService implements CollectionMapper { public get afterRepositoryRegistered(): Observable> { return this._repositoryRegistered; diff --git a/client/src/app/site/services/color.service.ts b/client/src/app/site/services/color.service.ts index b0694b75f6..a847272802 100644 --- a/client/src/app/site/services/color.service.ts +++ b/client/src/app/site/services/color.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import tinycolor from 'tinycolor2'; import { HtmlColor } from '../../domain/definitions/key-types'; @@ -33,9 +33,7 @@ export class Color { } } -@Injectable({ - providedIn: `root` -}) +@Service() export class ColorService { public parseHtmlColorToColor(htmlColor: string | HtmlColor): Color { return new Color(htmlColor); diff --git a/client/src/app/site/services/component-service-collector.service.ts b/client/src/app/site/services/component-service-collector.service.ts index 529c1c3842..a98b039f49 100644 --- a/client/src/app/site/services/component-service-collector.service.ts +++ b/client/src/app/site/services/component-service-collector.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { Title } from '@angular/platform-browser'; import { Router } from '@angular/router'; @@ -6,15 +6,11 @@ import { Router } from '@angular/router'; import { StorageService } from '../../gateways/storage.service'; import { ModelRequestService } from './model-request.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ComponentServiceCollectorService { - public constructor( - public router: Router, - public titleService: Title, - public matSnackBar: MatSnackBar, - public storage: StorageService, - public modelRequestService: ModelRequestService - ) {} + public router = inject(Router); + public titleService = inject(Title); + public matSnackBar = inject(MatSnackBar); + public storage = inject(StorageService); + public modelRequestService = inject(ModelRequestService); } diff --git a/client/src/app/site/services/connection-status.service.ts b/client/src/app/site/services/connection-status.service.ts index 4b7d44e923..a2d8fe1edb 100644 --- a/client/src/app/site/services/connection-status.service.ts +++ b/client/src/app/site/services/connection-status.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { _ } from '@ngx-translate/core'; import { BehaviorSubject, filter, firstValueFrom, fromEvent, map, Observable } from 'rxjs'; @@ -28,9 +28,7 @@ const OFFLINE_BANNER: BannerDefinition = { /** * This service handles the status being connected to the internet. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class ConnectionStatusService { public get offlineGone(): Observable { return this.isOfflineObservable.pipe( @@ -54,7 +52,9 @@ export class ConnectionStatusService { private _config: OfflineReasonConfig | null = null; - public constructor(private bannerService: BannerService) { + private bannerService = inject(BannerService); + + public constructor() { fromEvent(window, `offline`).subscribe(() => this.goOffline(DEFAULT_OFFLINE_REASON)); } diff --git a/client/src/app/site/services/controller-service-collector.service.ts b/client/src/app/site/services/controller-service-collector.service.ts index e9e77061ba..4469aa1afc 100644 --- a/client/src/app/site/services/controller-service-collector.service.ts +++ b/client/src/app/site/services/controller-service-collector.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { CollectionMapperService } from './collection-mapper.service'; @@ -6,15 +6,11 @@ import { DataStoreService } from './data-store.service'; import { RelationManagerService } from './relation-manager.service'; import { ViewModelStoreService } from './view-model-store.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ControllerServiceCollectorService { - public constructor( - public translate: TranslateService, - public readonly DS: DataStoreService, - public collectionMapperService: CollectionMapperService, - public viewModelStoreService: ViewModelStoreService, - public relationManager: RelationManagerService - ) {} + public translate = inject(TranslateService); + public readonly DS = inject(DataStoreService); + public collectionMapperService = inject(CollectionMapperService); + public viewModelStoreService = inject(ViewModelStoreService); + public relationManager = inject(RelationManagerService); } diff --git a/client/src/app/site/services/data-store-update-manager.service.ts b/client/src/app/site/services/data-store-update-manager.service.ts index 5232b04246..b5cc5aa8f4 100644 --- a/client/src/app/site/services/data-store-update-manager.service.ts +++ b/client/src/app/site/services/data-store-update-manager.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Deferred } from '../../infrastructure/utils/promises'; import { CollectionMapperService } from './collection-mapper.service'; @@ -112,9 +112,7 @@ class UpdateSlot { } } -@Injectable({ - providedIn: `root` -}) +@Service() export class DataStoreUpdateManagerService { /** * The current update slot @@ -126,10 +124,7 @@ export class DataStoreUpdateManagerService { */ private updateSlotRequests: Deferred[] = []; - /** - * @param mapperService - */ - public constructor(private mapperService: CollectionMapperService) {} + private mapperService = inject(CollectionMapperService); /** * Retrieve the current update slot. diff --git a/client/src/app/site/services/data-store.service.ts b/client/src/app/site/services/data-store.service.ts index 3950dedc70..c9e5e341b1 100644 --- a/client/src/app/site/services/data-store.service.ts +++ b/client/src/app/site/services/data-store.service.ts @@ -1,4 +1,4 @@ -import { EventEmitter, Injectable } from '@angular/core'; +import { EventEmitter, inject, Service } from '@angular/core'; import { Collection, Ids } from '@app/domain/definitions/key-types'; import { Observable, Subject } from 'rxjs'; @@ -30,9 +30,7 @@ type ModelCollection = any> = Record; */ type ModelStorage = Record; -@Injectable({ - providedIn: `root` -}) +@Service() export class DataStoreService { protected modelStore: ModelStorage = {}; @@ -70,10 +68,8 @@ export class DataStoreService { return this.clearEvent; } - public constructor( - protected modelMapper: CollectionMapperService, - private DSUpdateManager: DataStoreUpdateManagerService - ) {} + protected modelMapper = inject(CollectionMapperService); + private DSUpdateManager = inject(DataStoreUpdateManagerService); /** * Get an model observable for models from a given collection. These observable will be notified, diff --git a/client/src/app/site/services/duration.service.ts b/client/src/app/site/services/duration.service.ts index cb299e84b7..6047b5b145 100644 --- a/client/src/app/site/services/duration.service.ts +++ b/client/src/app/site/services/duration.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; /** * Helper service to convert numbers to time representation @@ -28,15 +28,8 @@ import { Injectable } from '@angular/core'; * const a = this.durationService.durationToString(30, 'm'); * ``` */ -@Injectable({ - providedIn: `root` -}) +@Service() export class DurationService { - /** - * Constructor - */ - public constructor() {} - /** * Transform a duration string to duration in minutes or seconds. This depends on the * provided suffix for the input. diff --git a/client/src/app/site/services/fallback-routes.service.ts b/client/src/app/site/services/fallback-routes.service.ts index de0416c41b..a244eab602 100644 --- a/client/src/app/site/services/fallback-routes.service.ts +++ b/client/src/app/site/services/fallback-routes.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Permission } from '@app/domain/definitions/permission'; import { OperatorService } from './operator.service'; @@ -12,18 +12,14 @@ interface AuthGuardFallbackEntry { /** * Classical Auth-Guard. Checks if the user has to correct permissions to enter a page, and forwards to login if not. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class FallbackRoutesService { private fallbackEntries: AuthGuardFallbackEntry[] = []; /** - * Constructor - * - * @param operator Asking for the required permission + * operator Asking for the required permission */ - public constructor(private operator: OperatorService) {} + private operator = inject(OperatorService); /** * Adds fallback navigation entries for the start page. diff --git a/client/src/app/site/services/global-search/global-search.service.ts b/client/src/app/site/services/global-search/global-search.service.ts index 97c1d5b4e0..77fef139c3 100644 --- a/client/src/app/site/services/global-search/global-search.service.ts +++ b/client/src/app/site/services/global-search/global-search.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Fqid, Id } from '@app/domain/definitions/key-types'; import { Meeting } from '@app/domain/models/meetings/meeting'; import { Motion } from '@app/domain/models/motions'; @@ -15,15 +15,11 @@ import { TranslateService } from '@ngx-translate/core'; import { ActiveMeetingService } from '../../pages/meetings/services/active-meeting.service'; import { GlobalSearchEntry, GlobalSearchResponse, GlobalSearchResponseEntry } from './definitions'; -@Injectable({ - providedIn: `root` -}) +@Service() export class GlobalSearchService { - public constructor( - private translate: TranslateService, - private http: HttpService, - private activeMeeting: ActiveMeetingService - ) {} + private translate = inject(TranslateService); + private http = inject(HttpService); + private activeMeeting = inject(ActiveMeetingService); public async searchChange( searchTerm: string, diff --git a/client/src/app/site/services/import-service-collector.service.ts b/client/src/app/site/services/import-service-collector.service.ts index 7c47bf3c86..5ea2ecbb11 100644 --- a/client/src/app/site/services/import-service-collector.service.ts +++ b/client/src/app/site/services/import-service-collector.service.ts @@ -1,15 +1,11 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatSnackBar } from '@angular/material/snack-bar'; import { TranslateService } from '@ngx-translate/core'; import { Papa } from 'ngx-papaparse'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ImportServiceCollectorService { - public constructor( - public readonly matSnackBar: MatSnackBar, - public readonly translate: TranslateService, - public readonly papa: Papa - ) {} + public readonly matSnackBar = inject(MatSnackBar); + public readonly translate = inject(TranslateService); + public readonly papa = inject(Papa); } diff --git a/client/src/app/site/services/lifecycle.service.ts b/client/src/app/site/services/lifecycle.service.ts index b0288a955b..7d33766efc 100644 --- a/client/src/app/site/services/lifecycle.service.ts +++ b/client/src/app/site/services/lifecycle.service.ts @@ -1,10 +1,8 @@ -import { EventEmitter, Injectable } from '@angular/core'; +import { EventEmitter, inject, Service } from '@angular/core'; import { StorageService } from '@app/gateways/storage.service'; import { Deferred } from '@app/infrastructure/utils/promises'; -@Injectable({ - providedIn: `root` -}) +@Service() export class LifecycleService { /** * This event is emitted, if the app becomes stable. It is ensured to happen after DomContentLoaded. @@ -40,7 +38,7 @@ export class LifecycleService { private _booted = new Deferred(); - public constructor(private storageService: StorageService) {} + private storageService = inject(StorageService); public bootup(): void { this._isBooted = true; diff --git a/client/src/app/site/services/model-request-builder/model-request-builder.service.ts b/client/src/app/site/services/model-request-builder/model-request-builder.service.ts index c5a35ff373..eb36d2a736 100644 --- a/client/src/app/site/services/model-request-builder/model-request-builder.service.ts +++ b/client/src/app/site/services/model-request-builder/model-request-builder.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { FieldDescriptor, Fields, @@ -74,18 +74,14 @@ export const DEFAULT_FIELDSET = `detail`; */ export const ROUTING_FIELDSET = `routing`; -@Injectable({ - providedIn: `root` -}) +@Service() export class ModelRequestBuilderService { private fieldsets: Record> = {}; private loaded = new Deferred(); - public constructor( - private relationManager: RelationManagerService, - private collectionMapper: CollectionMapperService - ) {} + private relationManager = inject(RelationManagerService); + private collectionMapper = inject(CollectionMapperService); public onAfterAppsLoaded(): void { for (const repo of this.collectionMapper.getAllRepositories()) { diff --git a/client/src/app/site/services/model-request.service.ts b/client/src/app/site/services/model-request.service.ts index 8ef60510cf..d02d820bfa 100644 --- a/client/src/app/site/services/model-request.service.ts +++ b/client/src/app/site/services/model-request.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { isValidId } from '@app/infrastructure/utils'; import { ModelRequestBuilderService } from '@app/site/services/model-request-builder'; import { filter, first, Observable, Subscription } from 'rxjs'; @@ -23,17 +23,15 @@ interface ModelSubscriptionMapEntry { export const SUBSCRIPTION_SUFFIX = `:subscription`; -@Injectable({ - providedIn: `root` -}) +@Service() export class ModelRequestService { private _modelSubscriptionMap = new Map(); - public constructor( - private autoupdateService: AutoupdateService, - private modelRequestBuilder: ModelRequestBuilderService, - private visibilityService: WindowVisibilityService - ) { + private autoupdateService = inject(AutoupdateService); + private modelRequestBuilder = inject(ModelRequestBuilderService); + private visibilityService = inject(WindowVisibilityService); + + public constructor() { this.visibilityService.hiddenFor(Math.max(0, AU_PAUSE_ON_INACTIVITY_TIMEOUT - 500)).subscribe(() => { for (const key of this._modelSubscriptionMap.keys()) { if (this._modelSubscriptionMap.get(key).unusedSubscription?.closed) { diff --git a/client/src/app/site/services/openslides-router.service.ts b/client/src/app/site/services/openslides-router.service.ts index 5b2073d3b0..add965101e 100644 --- a/client/src/app/site/services/openslides-router.service.ts +++ b/client/src/app/site/services/openslides-router.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Injector } from '@angular/core'; +import { inject, Injector, Service } from '@angular/core'; import { ActivatedRoute, ActivatedRouteSnapshot, @@ -34,9 +34,7 @@ enum UrlTarget { ORGANIZATION_LAYER = `organization_layer` } -@Injectable({ - providedIn: `root` -}) +@Service() export class OpenSlidesRouterService { private preLoginRedirectUrl: UrlTree; @@ -62,19 +60,19 @@ export class OpenSlidesRouterService { private _currentUrl: string | null = null; private _currentMeetingId: Id | null = null; - public constructor( - _auth: AuthService, - private router: Router, - private route: ActivatedRoute, - private injector: Injector, - private activeMeetingIdService: ActiveMeetingIdService, - private updateService: UpdateService, - private operator: OperatorService - ) { - _auth.logoutObservable.subscribe(() => { + private _auth = inject(AuthService); + private router = inject(Router); + private route = inject(ActivatedRoute); + private injector = inject(Injector); + private activeMeetingIdService = inject(ActiveMeetingIdService); + private updateService = inject(UpdateService); + private operator = inject(OperatorService); + + public constructor() { + this._auth.logoutObservable.subscribe(() => { this.navigateToLogin(true); }); - router.events + this.router.events .pipe( filter(event => event instanceof RoutesRecognized), tap(event => this.checkNextTarget(event as any)), @@ -82,7 +80,7 @@ export class OpenSlidesRouterService { distinctUntilChanged() ) .subscribe(event => this._currentParamMap.next(event)); - activeMeetingIdService.meetingIdChanged.subscribe(event => console.log(`has meeting changed?`, event)); + this.activeMeetingIdService.meetingIdChanged.subscribe(event => console.log(`has meeting changed?`, event)); this.operator.operatorUpdated.subscribe(() => { if (!this.operator.knowsMultipleMeetings && !this.activeMeetingIdService.meetingId) { diff --git a/client/src/app/site/services/openslides-status.service.ts b/client/src/app/site/services/openslides-status.service.ts index 0692995c71..46aac98083 100644 --- a/client/src/app/site/services/openslides-status.service.ts +++ b/client/src/app/site/services/openslides-status.service.ts @@ -1,10 +1,8 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { Deferred } from '@app/infrastructure/utils/promises'; import { BehaviorSubject, Observable } from 'rxjs'; -@Injectable({ - providedIn: `root` -}) +@Service() export class OpenSlidesStatusService { public get stable(): Promise { return this._stable; diff --git a/client/src/app/site/services/openslides.service.ts b/client/src/app/site/services/openslides.service.ts index 057d65ea25..910c4233bf 100644 --- a/client/src/app/site/services/openslides.service.ts +++ b/client/src/app/site/services/openslides.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { AuthService } from './auth.service'; @@ -6,17 +6,15 @@ import { ConnectionStatusService } from './connection-status.service'; import { LifecycleService } from './lifecycle.service'; import { OpenSlidesRouterService } from './openslides-router.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class OpenSlidesService { - public constructor( - private offlineService: ConnectionStatusService, - private lifecycleService: LifecycleService, - private authService: AuthService, - private osRouter: OpenSlidesRouterService, - private translate: TranslateService - ) { + private offlineService = inject(ConnectionStatusService); + private lifecycleService = inject(LifecycleService); + private authService = inject(AuthService); + private osRouter = inject(OpenSlidesRouterService); + private translate = inject(TranslateService); + + public constructor() { this.lifecycleService.appLoaded.subscribe(() => this.bootup()); } diff --git a/client/src/app/site/services/operator.service.ts b/client/src/app/site/services/operator.service.ts index 584d9de1ef..e69dd0c8e9 100644 --- a/client/src/app/site/services/operator.service.ts +++ b/client/src/app/site/services/operator.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { DelegationSetting, delegationSettings } from '@app/domain/definitions/delegation-setting'; import { UserFieldsets } from '@app/domain/fieldsets/user'; import { Settings } from '@app/domain/models/meetings/meeting'; @@ -39,9 +39,7 @@ import { SimplifiedModelRequest } from './model-request-builder/model-request-bu const UNKOWN_USER_ID = -1; // this is an invalid id **and** not equal to 0, null, undefined. -@Injectable({ - providedIn: `root` -}) +@Service() export class OperatorService { public get operatorId(): number | null { return this.isAnonymous || !this.authService.authToken ? null : this.authService.authToken.userId; @@ -266,20 +264,20 @@ export class OperatorService { private _OML: string | null | undefined = undefined; // null is valid, so use undefined here private _CML: Record | undefined = undefined; - public constructor( - private activeMeetingService: ActiveMeetingService, - private DS: DataStoreService, - private authService: AuthService, - private lifecycle: LifecycleService, - private userRepo: UserRepositoryService, - private meetingUserRepo: MeetingUserRepositoryService, - private groupRepo: GroupControllerService, - private autoupdateService: AutoupdateService, - private modelRequestBuilder: ModelRequestBuilderService, - private meetingRepo: MeetingControllerService, - private meetingSettings: MeetingSettingsService, - private organizationService: OrganizationService - ) { + private activeMeetingService = inject(ActiveMeetingService); + private DS = inject(DataStoreService); + private authService = inject(AuthService); + private lifecycle = inject(LifecycleService); + private userRepo = inject(UserRepositoryService); + private meetingUserRepo = inject(MeetingUserRepositoryService); + private groupRepo = inject(GroupControllerService); + private autoupdateService = inject(AutoupdateService); + private modelRequestBuilder = inject(ModelRequestBuilderService); + private meetingRepo = inject(MeetingControllerService); + private meetingSettings = inject(MeetingSettingsService); + private organizationService = inject(OrganizationService); + + public constructor() { this.setNotReady(); // General environment in which the operator moves this.authService.authTokenObservable.subscribe(token => { diff --git a/client/src/app/site/services/relation-manager.service.ts b/client/src/app/site/services/relation-manager.service.ts index af9bafb649..31ae1be7d9 100644 --- a/client/src/app/site/services/relation-manager.service.ts +++ b/client/src/app/site/services/relation-manager.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { filter, map, merge, Observable } from 'rxjs'; import { Fqid } from '../../domain/definitions/key-types'; @@ -25,16 +25,14 @@ export function ensureIdField(relation: Partial): string { } } -@Injectable({ - providedIn: `root` -}) +@Service() export class RelationManagerService { private relationsByCollection: Record = {}; - public constructor( - private viewModelStoreService: ViewModelStoreService, - private collectionMapper: CollectionMapperService - ) { + private viewModelStoreService = inject(ViewModelStoreService); + private collectionMapper = inject(CollectionMapperService); + + public constructor() { this.loadRelations(); } diff --git a/client/src/app/site/services/reroute.service.ts b/client/src/app/site/services/reroute.service.ts index c3a67b87a4..fbabffadaf 100644 --- a/client/src/app/site/services/reroute.service.ts +++ b/client/src/app/site/services/reroute.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Data, Router, UrlSegment, UrlTree } from '@angular/router'; import { Id } from '@app/domain/definitions/key-types'; import { firstValueFrom } from 'rxjs'; @@ -7,16 +7,12 @@ import { FallbackRoutesService } from './fallback-routes.service'; import { OpenSlidesRouterService } from './openslides-router.service'; import { OperatorService } from './operator.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class RerouteService { - public constructor( - private router: Router, - private fallbackRoutesService: FallbackRoutesService, - private operator: OperatorService, - private osRouter: OpenSlidesRouterService - ) {} + private router = inject(Router); + private fallbackRoutesService = inject(FallbackRoutesService); + private operator = inject(OperatorService); + private osRouter = inject(OpenSlidesRouterService); /** * Handles a forbidden route. If the route is "/" (start page), It is tried to diff --git a/client/src/app/site/services/theme.service.ts b/client/src/app/site/services/theme.service.ts index 688dcdda10..65d508b753 100644 --- a/client/src/app/site/services/theme.service.ts +++ b/client/src/app/site/services/theme.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { ThemePalette } from '@angular/material/core'; import { ThemeRepositoryService } from '@app/gateways/repositories/themes/theme-repository.service'; import { BehaviorSubject, Observable, Subscription } from 'rxjs'; @@ -21,9 +21,7 @@ export const GENERAL_DEFAULT_COLORS: Partial = { }; export type GeneralDefaultColorName = keyof typeof GENERAL_DEFAULT_COLORS; -@Injectable({ - providedIn: `root` -}) +@Service() export class ThemeService { public static readonly DEFAULT_PRIMARY_COLOR = `#317796`; public static readonly DEFAULT_ACCENT_COLOR = `#2196f3`; @@ -72,18 +70,18 @@ export class ThemeService { * * @param orgaSettings must be injected to get the theme. */ - public constructor( - orgaSettings: OrganizationSettingsService, - private colorService: ColorService, - private themeRepo: ThemeRepositoryService, - private storage: StorageService - ) { - orgaSettings.get(`theme_id`).subscribe(themeId => { + private orgaSettings = inject(OrganizationSettingsService); + private colorService = inject(ColorService); + private themeRepo = inject(ThemeRepositoryService); + private storage = inject(StorageService); + + public constructor() { + this.orgaSettings.get(`theme_id`).subscribe(themeId => { if (themeId) { this.changeThemeById(themeId); } }); - storage.get(DARK_MODE_STORAGE_KEY).then(useDarkMode => this.setInitialTheme(useDarkMode)); + this.storage.get(DARK_MODE_STORAGE_KEY).then(useDarkMode => this.setInitialTheme(useDarkMode)); // The observable above will not fire. Do it by hand this.changeThemePalettes(); } diff --git a/client/src/app/site/services/time-zone.service.ts b/client/src/app/site/services/time-zone.service.ts index 8c97606578..d9d6ff71af 100644 --- a/client/src/app/site/services/time-zone.service.ts +++ b/client/src/app/site/services/time-zone.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { Selectable } from '@app/domain/interfaces'; import { GetValidTimezonesPresenterService } from '@app/gateways/presenter/get-valid-timezones'; @@ -26,9 +26,7 @@ class SearchSelectorHelper implements Selectable { } } -@Injectable({ - providedIn: `root` -}) +@Service() export class TimeZoneService { private activeMeetingRepo = inject(ActiveMeetingService); private organizationRepo = inject(OrganizationControllerService); diff --git a/client/src/app/site/services/user-controller.service.ts b/client/src/app/site/services/user-controller.service.ts index 4dfc8e863c..2281301ed2 100644 --- a/client/src/app/site/services/user-controller.service.ts +++ b/client/src/app/site/services/user-controller.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { OML } from '@app/domain/definitions/organization-permission'; import { GetActiveUsersAmountPresenterService } from '@app/gateways/presenter'; @@ -35,16 +35,15 @@ export interface CreateUserNameInformation { title?: string; } -@Injectable({ - providedIn: `root` -}) +@Service() export class UserControllerService extends BaseController { - public constructor( - controllerServiceCollector: ControllerServiceCollectorService, - protected override repo: UserRepositoryService, - private presenter: GetActiveUsersAmountPresenterService, - private operator: OperatorService - ) { + protected override repo: UserRepositoryService; + private presenter = inject(GetActiveUsersAmountPresenterService); + private operator = inject(OperatorService); + + public constructor() { + const controllerServiceCollector = inject(ControllerServiceCollectorService); + const repo = inject(UserRepositoryService); super(controllerServiceCollector, User, repo); } diff --git a/client/src/app/site/services/user.service.ts b/client/src/app/site/services/user.service.ts index 3b4f4dd3c6..f01f711976 100644 --- a/client/src/app/site/services/user.service.ts +++ b/client/src/app/site/services/user.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Id } from '@app/domain/definitions/key-types'; import { CML, OML } from '@app/domain/definitions/organization-permission'; import { Permission } from '@app/domain/definitions/permission'; @@ -6,25 +6,18 @@ import { GetUserEditablePresenterService, GetUserScopePresenterService } from '@ import { ActiveMeetingService } from '@app/site/pages/meetings/services/active-meeting.service'; import { OperatorService } from '@app/site/services/operator.service'; -import { MeetingControllerService } from '../pages/meetings/services/meeting-controller.service'; - export enum UserScope { MEETING = `meeting`, COMMITTEE = `committee`, ORGANIZATION = `organization` } -@Injectable({ - providedIn: `root` -}) +@Service() export class UserService { - public constructor( - private activeMeetingService: ActiveMeetingService, - private presenter: GetUserScopePresenterService, - private operator: OperatorService, - private meetingRepo: MeetingControllerService, - private getUserEditablePresenter: GetUserEditablePresenterService - ) {} + private activeMeetingService = inject(ActiveMeetingService); + private presenter = inject(GetUserScopePresenterService); + private operator = inject(OperatorService); + private getUserEditablePresenter = inject(GetUserEditablePresenterService); /** * Should determine if the user (Operator) has the diff --git a/client/src/app/site/services/view-model-store-update.service.ts b/client/src/app/site/services/view-model-store-update.service.ts index 3414710d72..57756f9fe4 100644 --- a/client/src/app/site/services/view-model-store-update.service.ts +++ b/client/src/app/site/services/view-model-store-update.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Collection, Id, Ids } from '@app/domain/definitions/key-types'; import { BaseModel, BaseModelTemplate } from '@app/domain/models/base/base-model'; import { CollectionMapperService } from '@app/site/services/collection-mapper.service'; @@ -29,15 +29,11 @@ interface UpdatePatch { type ModelPatch = Record>; -@Injectable({ - providedIn: `root` -}) +@Service() export class ViewModelStoreUpdateService { - public constructor( - private DS: DataStoreService, - private DSUpdateService: DataStoreUpdateManagerService, - private collectionMapper: CollectionMapperService - ) {} + private DS = inject(DataStoreService); + private DSUpdateService = inject(DataStoreUpdateManagerService); + private collectionMapper = inject(CollectionMapperService); public async triggerUpdate({ changedModels, diff --git a/client/src/app/site/services/view-model-store.service.ts b/client/src/app/site/services/view-model-store.service.ts index 76dd7ee002..23bd730c9e 100644 --- a/client/src/app/site/services/view-model-store.service.ts +++ b/client/src/app/site/services/view-model-store.service.ts @@ -1,14 +1,12 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { BaseRepository } from '../../gateways/repositories/base-repository'; import { BaseViewModel, ViewModelConstructor } from '../base/base-view-model'; import { CollectionMapperService } from './collection-mapper.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class ViewModelStoreService { - public constructor(private collectionMapperService: CollectionMapperService) {} + private collectionMapperService = inject(CollectionMapperService); /** * gets the repository from a collection string or a view model constructor. diff --git a/client/src/app/site/services/view-port.service.ts b/client/src/app/site/services/view-port.service.ts index 7760f06e12..2d93b76bb1 100644 --- a/client/src/app/site/services/view-port.service.ts +++ b/client/src/app/site/services/view-port.service.ts @@ -1,5 +1,5 @@ import { BreakpointObserver, Breakpoints, BreakpointState } from '@angular/cdk/layout'; -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; /** @@ -20,9 +20,7 @@ import { BehaviorSubject } from 'rxjs'; * * ``` */ -@Injectable({ - providedIn: `root` -}) +@Service() export class ViewPortService { /** * Simple boolean to determine whether the client is in mobile view or not @@ -46,7 +44,9 @@ export class ViewPortService { * * @param breakpointObserver */ - public constructor(private breakpointObserver: BreakpointObserver) { + private breakpointObserver = inject(BreakpointObserver); + + public constructor() { this.checkForChange(); } diff --git a/client/src/app/site/services/window-visibility.service.ts b/client/src/app/site/services/window-visibility.service.ts index 42c1ae934e..ea9fe86ecf 100644 --- a/client/src/app/site/services/window-visibility.service.ts +++ b/client/src/app/site/services/window-visibility.service.ts @@ -1,13 +1,11 @@ -import { Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { debounceTime, filter, firstValueFrom, fromEvent, map, Observable, skipUntil } from 'rxjs'; import { LifecycleService } from './lifecycle.service'; -@Injectable({ - providedIn: `root` -}) +@Service() export class WindowVisibilityService { - public constructor(private lifecycle: LifecycleService) {} + private lifecycle = inject(LifecycleService); public async waitUntilVisible(): Promise { if (document.visibilityState !== `visible`) { diff --git a/client/src/app/ui/modules/choice-dialog/services/choice.service.ts b/client/src/app/ui/modules/choice-dialog/services/choice.service.ts index 658b745760..f07f3cb76a 100644 --- a/client/src/app/ui/modules/choice-dialog/services/choice.service.ts +++ b/client/src/app/ui/modules/choice-dialog/services/choice.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { Selectable } from '@app/domain/interfaces'; import { firstValueFrom, Observable } from 'rxjs'; @@ -7,7 +7,7 @@ import { infoDialogSettings } from '../../../../infrastructure/utils/dialog-sett import { ChoiceDialogComponent } from '../choice-dialog.component'; import { ChoiceAnswer, ChoiceDialogConfig } from '../definitions'; -@Injectable({ providedIn: `root` }) +@Service() export class ChoiceService { private dialog = inject(MatDialog); diff --git a/client/src/app/ui/modules/head-bar/services/routing-state.service.ts b/client/src/app/ui/modules/head-bar/services/routing-state.service.ts index 7132d33f01..086e336be2 100644 --- a/client/src/app/ui/modules/head-bar/services/routing-state.service.ts +++ b/client/src/app/ui/modules/head-bar/services/routing-state.service.ts @@ -1,5 +1,5 @@ import { Location } from '@angular/common'; -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { Router, RoutesRecognized } from '@angular/router'; import { filter, pairwise, startWith } from 'rxjs'; @@ -7,9 +7,7 @@ import { filter, pairwise, startWith } from 'rxjs'; * Watches URL changes. * Can be enhanced using locale storage to support back-navigation even after reload */ -@Injectable({ - providedIn: `root` -}) +@Service() export class RoutingStateService { private skipUnsafeRouteCheck = false; /** diff --git a/client/src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.ts b/client/src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.ts index 54e864e964..0ab5da2dc6 100644 --- a/client/src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.ts +++ b/client/src/app/ui/modules/openslides-date-adapter/openslides-date-adapter.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { DateFnsAdapter } from '@angular/material-date-fns-adapter'; import { langToTimeLocale } from '@app/infrastructure/utils'; import { TranslateService } from '@ngx-translate/core'; @@ -7,7 +7,7 @@ import { TranslateService } from '@ngx-translate/core'; * A custom DateAdapter for the datetimepicker in the config. Uses MomentDateAdapter for localisation. * Is needed to subscribe to language changes */ -@Injectable() +@Service() export class OpenSlidesDateAdapter extends DateFnsAdapter { private translate = inject(TranslateService); diff --git a/client/src/app/ui/modules/openslides-overlay/services/overlay.service.ts b/client/src/app/ui/modules/openslides-overlay/services/overlay.service.ts index 2c3e1f7ae1..9390a8cb91 100644 --- a/client/src/app/ui/modules/openslides-overlay/services/overlay.service.ts +++ b/client/src/app/ui/modules/openslides-overlay/services/overlay.service.ts @@ -1,10 +1,10 @@ -import { inject, Injectable, Type } from '@angular/core'; +import { inject, Service, Type } from '@angular/core'; import { DomService } from '@app/openslides-main-module/services/dom.service'; import { CustomOverlayConfig, OverlayInstance } from '../definitions'; import { OverlayComponent } from '../overlay.component'; -@Injectable({ providedIn: `root` }) +@Service() export class OverlayService { private domService = inject(DomService); diff --git a/client/src/app/ui/modules/prompt-dialog/services/prompt.service.ts b/client/src/app/ui/modules/prompt-dialog/services/prompt.service.ts index 2de141347f..77e6c7b729 100644 --- a/client/src/app/ui/modules/prompt-dialog/services/prompt.service.ts +++ b/client/src/app/ui/modules/prompt-dialog/services/prompt.service.ts @@ -1,13 +1,11 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { TranslateService } from '@ngx-translate/core'; import { firstValueFrom } from 'rxjs'; import { PromptDialogComponent } from '../prompt-dialog.component'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class PromptService { private dialogRef: MatDialogRef | null = null; diff --git a/client/src/app/ui/modules/scrolling-table/services/scrolling-table-manage.service.ts b/client/src/app/ui/modules/scrolling-table/services/scrolling-table-manage.service.ts index b94a22dc2b..840fc79606 100644 --- a/client/src/app/ui/modules/scrolling-table/services/scrolling-table-manage.service.ts +++ b/client/src/app/ui/modules/scrolling-table/services/scrolling-table-manage.service.ts @@ -1,5 +1,5 @@ import { TemplatePortal } from '@angular/cdk/portal'; -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { BehaviorSubject, Observable } from 'rxjs'; import { ScrollingTableComponent } from '../components/scrolling-table/scrolling-table.component'; @@ -43,9 +43,7 @@ class ScrollingTableCellHandler implements Iterable | null = null; diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service.ts index cde5da710c..83f0e14623 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service.ts @@ -1,4 +1,4 @@ -import { inject, Injectable } from '@angular/core'; +import { inject, Service } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { NotifyResponse, NotifyService } from '@app/gateways/notify.service'; import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; @@ -7,9 +7,7 @@ import { TranslateService } from '@ngx-translate/core'; import { ChessDialogModule } from '../chess-dialog.module'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class ChessChallengeService { private notifyService = inject(NotifyService); private dialog = inject(MatDialog); diff --git a/client/src/app/ui/modules/sidenav/modules/easter-egg/services/easter-egg-content-platform.service.ts b/client/src/app/ui/modules/sidenav/modules/easter-egg/services/easter-egg-content-platform.service.ts index 1538510b22..d1f2a0ee1b 100644 --- a/client/src/app/ui/modules/sidenav/modules/easter-egg/services/easter-egg-content-platform.service.ts +++ b/client/src/app/ui/modules/sidenav/modules/easter-egg/services/easter-egg-content-platform.service.ts @@ -1,13 +1,11 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; import { mediumDialogSettings } from '@app/infrastructure/utils/dialog-settings'; import { BaseDialogService } from '@app/ui/base/base-dialog-service'; import { EasterEggContentPlatformDialogComponent } from '../components/easter-egg-content-platform-dialog/easter-egg-content-platform-dialog.component'; -@Injectable({ - providedIn: 'root' -}) +@Service() export class EasterEggContentPlatformService extends BaseDialogService< EasterEggContentPlatformDialogComponent, void, diff --git a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree-sort.service.ts b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree-sort.service.ts index 259081dbb5..d7531c7155 100644 --- a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree-sort.service.ts +++ b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree-sort.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { Displayable, Identifiable } from '@app/domain/interfaces'; import { FlatNode } from '@app/infrastructure/definitions/tree'; import { BaseSortService, OsSortProperty } from '@app/site/base/base-sort.service'; @@ -8,9 +8,7 @@ import { BaseSortService, OsSortProperty } from '@app/site/base/base-sort.servic * * Contains base functions to sort a tree by different properties. */ -@Injectable({ - providedIn: `root` -}) +@Service() export class TreeSortService extends BaseSortService { /** * Function to sort the passed source of a tree diff --git a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts index 32166d3793..cb83dc2593 100644 --- a/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts +++ b/client/src/app/ui/modules/sorting/modules/sorting-tree/services/tree.service.ts @@ -1,11 +1,9 @@ -import { Injectable } from '@angular/core'; +import { Service } from '@angular/core'; import { Displayable, Identifiable } from '@app/domain/interfaces'; import { FlatNode, OSTreeNode, TreeIdNode, TreeNodeWithoutItem } from '@app/infrastructure/definitions/tree'; import { findIndexInSortedArray } from '@app/infrastructure/utils'; -@Injectable({ - providedIn: `root` -}) +@Service() export class TreeService { /** * Returns the weight casted to a number from a given model. From 6357e3762d38fc80d41b6422f160e7333de03efe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 11:11:03 +0200 Subject: [PATCH 59/71] Bump brace-expansion and vite-plugin-dts (#6422) --- .../openslides-motion-diff/package-lock.json | 794 +++--------------- packages/openslides-motion-diff/package.json | 2 +- 2 files changed, 129 insertions(+), 667 deletions(-) diff --git a/packages/openslides-motion-diff/package-lock.json b/packages/openslides-motion-diff/package-lock.json index e6e68eea77..f781f2e6f2 100644 --- a/packages/openslides-motion-diff/package-lock.json +++ b/packages/openslides-motion-diff/package-lock.json @@ -18,7 +18,7 @@ "jsdom": "^29.0.2", "typescript": "^5.8.3", "vite": "^8.0.16", - "vite-plugin-dts": "^4.5.4", + "vite-plugin-dts": "^5.0.3", "vitest": "^4.1.8" } }, @@ -338,6 +338,28 @@ } } }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", + "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "node_modules/@jridgewell/remapping": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", + "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", @@ -366,79 +388,6 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@microsoft/api-extractor": { - "version": "7.58.5", - "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.58.5.tgz", - "integrity": "sha512-pKQs2MBtGCVcIs1pxkSjhb1GGxYaS3KRCoi7Ki6qCJw6S/zx5ZYvC3CX39RpexBqYcO0asphyrqdW2ifyuSX6A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@microsoft/api-extractor-model": "7.33.8", - "@microsoft/tsdoc": "~0.16.0", - "@microsoft/tsdoc-config": "~0.18.1", - "@rushstack/node-core-library": "5.23.1", - "@rushstack/rig-package": "0.7.3", - "@rushstack/terminal": "0.23.0", - "@rushstack/ts-command-line": "5.3.8", - "diff": "~8.0.2", - "minimatch": "10.2.3", - "resolve": "~1.22.1", - "semver": "~7.7.4", - "source-map": "~0.6.1", - "typescript": "5.9.3" - }, - "bin": { - "api-extractor": "bin/api-extractor" - } - }, - "node_modules/@microsoft/api-extractor-model": { - "version": "7.33.8", - "resolved": "https://registry.npmjs.org/@microsoft/api-extractor-model/-/api-extractor-model-7.33.8.tgz", - "integrity": "sha512-aIcoQggPyer3B6Ze3usz0YWC/oBwUHfRH5ETUsr+oT2BRA6SfTJl7IKPcPZkX4UR+PohowzW4uMxsvjrn8vm+w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@microsoft/tsdoc": "~0.16.0", - "@microsoft/tsdoc-config": "~0.18.1", - "@rushstack/node-core-library": "5.23.1" - } - }, - "node_modules/@microsoft/api-extractor/node_modules/minimatch": { - "version": "10.2.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.3.tgz", - "integrity": "sha512-Rwi3pnapEqirPSbWbrZaa6N3nmqq4Xer/2XooiOKyV3q12ML06f7MOuc5DVH8ONZIFhwIYQ3yzPH4nt7iWHaTg==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "brace-expansion": "^5.0.2" - }, - "engines": { - "node": "18 || 20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@microsoft/tsdoc": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc/-/tsdoc-0.16.0.tgz", - "integrity": "sha512-xgAyonlVVS+q7Vc7qLW0UrJU7rSFcETRWsqdXZtjzRU8dF+6CkozTK4V4y1LwOX7j8r/vHphjDeMeGI4tNGeGA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@microsoft/tsdoc-config": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@microsoft/tsdoc-config/-/tsdoc-config-0.18.1.tgz", - "integrity": "sha512-9brPoVdfN9k9g0dcWkFeA7IH9bbcttzDJlXvkf8b2OBzd5MueR1V2wkKBL0abn0otvmkHJC6aapBOTJDDeMCZg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@microsoft/tsdoc": "0.16.0", - "ajv": "~8.18.0", - "jju": "~1.4.0", - "resolve": "~1.22.2" - } - }, "node_modules/@napi-rs/wasm-runtime": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.5.tgz", @@ -733,9 +682,9 @@ "license": "MIT" }, "node_modules/@rollup/pluginutils": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz", - "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.4.0.tgz", + "integrity": "sha512-MfPp06CjRLfXQ3wY0R8vJDYBy/MvVcc9OulEfR0B8Iv9ko+GCNaRZ+EpJYFl27LhKsZK0o420sYCRHCjfCgeUg==", "dev": true, "license": "MIT", "dependencies": { @@ -762,106 +711,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@rushstack/node-core-library": { - "version": "5.23.1", - "resolved": "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.23.1.tgz", - "integrity": "sha512-wlKmIKIYCKuCASbITvOxLZXepPbwXvrv7S6ig6XNWFchSyhL/E2txmVXspHY49Wu2dzf7nI27a2k/yV5BA3EiA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "~8.18.0", - "ajv-draft-04": "~1.0.0", - "ajv-formats": "~3.0.1", - "fs-extra": "~11.3.0", - "import-lazy": "~4.0.0", - "jju": "~1.4.0", - "resolve": "~1.22.1", - "semver": "~7.7.4" - }, - "peerDependencies": { - "@types/node": "*" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@rushstack/problem-matcher": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@rushstack/problem-matcher/-/problem-matcher-0.2.1.tgz", - "integrity": "sha512-gulfhBs6n+I5b7DvjKRfhMGyUejtSgOHTclF/eONr8hcgF1APEDjhxIsfdUYYMzC3rvLwGluqLjbwCFZ8nxrog==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "@types/node": "*" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@rushstack/rig-package": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/@rushstack/rig-package/-/rig-package-0.7.3.tgz", - "integrity": "sha512-aAA518n6wxxjCfnTAOjQnm7ngNE0FVHxHAw2pxKlIhxrMn0XQjGcXKF0oKWpjBgJOmsaJpVob/v+zr3zxgPWuA==", - "dev": true, - "license": "MIT", - "dependencies": { - "jju": "~1.4.0", - "resolve": "~1.22.1" - } - }, - "node_modules/@rushstack/terminal": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.23.0.tgz", - "integrity": "sha512-7FfI9irLqnBDxCvMEXdEXLDjaouZsGbKkeGfmW8IOn8aYi7DV9aaXaEQHCcVxWMvEDOkuTf4y6RMDgIY5CFuUQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@rushstack/node-core-library": "5.23.1", - "@rushstack/problem-matcher": "0.2.1", - "supports-color": "~8.1.1" - }, - "peerDependencies": { - "@types/node": "*" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - } - } - }, - "node_modules/@rushstack/terminal/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/@rushstack/ts-command-line": { - "version": "5.3.8", - "resolved": "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-5.3.8.tgz", - "integrity": "sha512-vKL4fVR2TdnMdCmlP71nZUzbNANOYlR7NfN+J/YL9UIvicDIEB+ZtH38LcJECOZUwHia8C5Mg98kc4kPt/ev5w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@rushstack/terminal": "0.23.0", - "@types/argparse": "1.0.38", - "argparse": "~1.0.9", - "string-argv": "~0.3.1" - } - }, "node_modules/@standard-schema/spec": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", @@ -880,13 +729,6 @@ "tslib": "^2.4.0" } }, - "node_modules/@types/argparse": { - "version": "1.0.38", - "resolved": "https://registry.npmjs.org/@types/argparse/-/argparse-1.0.38.tgz", - "integrity": "sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/chai": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz", @@ -1101,118 +943,10 @@ "vscode-uri": "^3.0.8" } }, - "node_modules/@vue/compiler-core": { - "version": "3.5.32", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.32.tgz", - "integrity": "sha512-4x74Tbtqnda8s/NSD6e1Dr5p1c8HdMU5RWSjMSUzb8RTcUQqevDCxVAitcLBKT+ie3o0Dl9crc/S/opJM7qBGQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/parser": "^7.29.2", - "@vue/shared": "3.5.32", - "entities": "^7.0.1", - "estree-walker": "^2.0.2", - "source-map-js": "^1.2.1" - } - }, - "node_modules/@vue/compiler-core/node_modules/estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true, - "license": "MIT" - }, - "node_modules/@vue/compiler-dom": { - "version": "3.5.32", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.32.tgz", - "integrity": "sha512-ybHAu70NtiEI1fvAUz3oXZqkUYEe5J98GjMDpTGl5iHb0T15wQYLR4wE3h9xfuTNA+Cm2f4czfe8B4s+CCH57Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@vue/compiler-core": "3.5.32", - "@vue/shared": "3.5.32" - } - }, - "node_modules/@vue/compiler-vue2": { - "version": "2.7.16", - "resolved": "https://registry.npmjs.org/@vue/compiler-vue2/-/compiler-vue2-2.7.16.tgz", - "integrity": "sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==", - "dev": true, - "license": "MIT", - "dependencies": { - "de-indent": "^1.0.2", - "he": "^1.2.0" - } - }, - "node_modules/@vue/language-core": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.0.tgz", - "integrity": "sha512-O1ZZFaaBGkKbsRfnVH1ifOK1/1BUkyK+3SQsfnh6PmMmD4qJcTU8godCeA96jjDRTL6zgnK7YzCHfaUlH2r0Mw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@volar/language-core": "~2.4.11", - "@vue/compiler-dom": "^3.5.0", - "@vue/compiler-vue2": "^2.7.16", - "@vue/shared": "^3.5.0", - "alien-signals": "^0.4.9", - "minimatch": "^9.0.3", - "muggle-string": "^0.4.1", - "path-browserify": "^1.0.1" - }, - "peerDependencies": { - "typescript": "*" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@vue/language-core/node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" - }, - "node_modules/@vue/language-core/node_modules/brace-expansion": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz", - "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@vue/language-core/node_modules/minimatch": { - "version": "9.0.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", - "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.2" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@vue/shared": { - "version": "3.5.32", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.32.tgz", - "integrity": "sha512-ksNyrmRQzWJJ8n3cRDuSF7zNNontuJg1YHnmWRJd2AMu8Ij2bqwiiri2lH5rHtYPZjj4STkNcgcmiQqlOjiYGg==", - "dev": true, - "license": "MIT" - }, "node_modules/acorn": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", - "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz", + "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==", "dev": true, "license": "MIT", "bin": { @@ -1222,73 +956,6 @@ "node": ">=0.4.0" } }, - "node_modules/ajv": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", - "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ajv-draft-04": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz", - "integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "ajv": "^8.5.0" - }, - "peerDependenciesMeta": { - "ajv": { - "optional": true - } - } - }, - "node_modules/ajv-formats": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", - "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^8.0.0" - }, - "peerDependencies": { - "ajv": "^8.0.0" - }, - "peerDependenciesMeta": { - "ajv": { - "optional": true - } - } - }, - "node_modules/alien-signals": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.4.14.tgz", - "integrity": "sha512-itUAVzhczTmP2U5yX67xVpsbbOiquusbWVyA9N+sy6+r6YVbFkahXvNCeEPWEOMhwDYwbVbGHFkVL03N9I5g+Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "license": "MIT", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, "node_modules/assertion-error": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", @@ -1311,16 +978,6 @@ "js-tokens": "^10.0.0" } }, - "node_modules/balanced-match": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", - "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "18 || 20 || >=22" - } - }, "node_modules/bidi-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz", @@ -1331,19 +988,6 @@ "require-from-string": "^2.0.2" } }, - "node_modules/brace-expansion": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", - "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^4.0.2" - }, - "engines": { - "node": "18 || 20 || >=22" - } - }, "node_modules/chai": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz", @@ -1403,13 +1047,6 @@ "node": "^20.19.0 || ^22.12.0 || >=24.0.0" } }, - "node_modules/de-indent": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", - "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==", - "dev": true, - "license": "MIT" - }, "node_modules/debug": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", @@ -1445,39 +1082,6 @@ "node": ">=8" } }, - "node_modules/diff": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.4.tgz", - "integrity": "sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/entities": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz", - "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, "node_modules/es-module-lexer": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz", @@ -1506,36 +1110,12 @@ } }, "node_modules/exsolve": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.8.tgz", - "integrity": "sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==", - "dev": true, - "license": "MIT" - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.1.0.tgz", + "integrity": "sha512-D+42+T12DdIlJM3uepa55qGiL3sYdLBOxIl2ifQCzCHz4c7eiolaHsi3BIqEr7JxBzxv2pYZQX9kw16ziMcEmw==", "dev": true, "license": "MIT" }, - "node_modules/fast-uri": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.3.tgz", - "integrity": "sha512-i70LwGWUduXqzicKXWshooq+sWL1K3WUU5rKZNG/0i3a1OSoX3HqhH5WbWwTmqWfor4urUakGPiRQcleRZTwOg==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fastify" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/fastify" - } - ], - "license": "BSD-3-Clause" - }, "node_modules/fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", @@ -1554,21 +1134,6 @@ } } }, - "node_modules/fs-extra": { - "version": "11.3.4", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz", - "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=14.14" - } - }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -1584,23 +1149,6 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, - "license": "ISC" - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -1611,29 +1159,6 @@ "node": ">=8" } }, - "node_modules/hasown": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz", - "integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, - "license": "MIT", - "bin": { - "he": "bin/he" - } - }, "node_modules/html-encoding-sniffer": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-6.0.0.tgz", @@ -1654,32 +1179,6 @@ "dev": true, "license": "MIT" }, - "node_modules/import-lazy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", - "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/is-core-module": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", - "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", - "dev": true, - "license": "MIT", - "dependencies": { - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-potential-custom-element-name": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", @@ -1726,13 +1225,6 @@ "node": ">=8" } }, - "node_modules/jju": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", - "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==", - "dev": true, - "license": "MIT" - }, "node_modules/js-tokens": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz", @@ -1791,26 +1283,6 @@ "node": "20 || >=22" } }, - "node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true, - "license": "MIT" - }, - "node_modules/jsonfile": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", - "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, "node_modules/kolorist": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz", @@ -2080,9 +1552,9 @@ } }, "node_modules/local-pkg": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.1.2.tgz", - "integrity": "sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.2.1.tgz", + "integrity": "sha512-++gUqRDEvcnN6Zhqrr+y/CkVEHhlrR96vZn3nZZPYzMcBUyBtTKzB9NadClFIsIVSsu+3i9tfk/erqy9kAmt7Q==", "dev": true, "license": "MIT", "dependencies": { @@ -2181,13 +1653,6 @@ "dev": true, "license": "MIT" }, - "node_modules/muggle-string": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz", - "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==", - "dev": true, - "license": "MIT" - }, "node_modules/nanoid": { "version": "3.3.12", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", @@ -2251,13 +1716,6 @@ "dev": true, "license": "MIT" }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, - "license": "MIT" - }, "node_modules/pathe": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", @@ -2286,14 +1744,14 @@ } }, "node_modules/pkg-types": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz", - "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.1.tgz", + "integrity": "sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg==", "dev": true, "license": "MIT", "dependencies": { - "confbox": "^0.2.2", - "exsolve": "^1.0.7", + "confbox": "^0.2.4", + "exsolve": "^1.0.8", "pathe": "^2.0.3" } }, @@ -2363,28 +1821,6 @@ "node": ">=0.10.0" } }, - "node_modules/resolve": { - "version": "1.22.12", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.12.tgz", - "integrity": "sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==", - "dev": true, - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0", - "is-core-module": "^2.16.1", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/rolldown": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.3.tgz", @@ -2452,16 +1888,6 @@ "dev": true, "license": "ISC" }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/source-map-js": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", @@ -2472,13 +1898,6 @@ "node": ">=0.10.0" } }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true, - "license": "BSD-3-Clause" - }, "node_modules/stackback": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", @@ -2493,16 +1912,6 @@ "dev": true, "license": "MIT" }, - "node_modules/string-argv": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", - "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.6.19" - } - }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -2516,19 +1925,6 @@ "node": ">=8" } }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", @@ -2655,9 +2051,9 @@ } }, "node_modules/ufo": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.3.tgz", - "integrity": "sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q==", + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.4.tgz", + "integrity": "sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==", "dev": true, "license": "MIT" }, @@ -2678,14 +2074,74 @@ "dev": true, "license": "MIT" }, - "node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "node_modules/unplugin": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-2.3.11.tgz", + "integrity": "sha512-5uKD0nqiYVzlmCRs01Fhs2BdkEgBS3SAVP6ndrBsuK42iC2+JHyxM05Rm9G8+5mkmRtzMZGY8Ct5+mliZxU/Ww==", "dev": true, "license": "MIT", + "dependencies": { + "@jridgewell/remapping": "^2.3.5", + "acorn": "^8.15.0", + "picomatch": "^4.0.3", + "webpack-virtual-modules": "^0.6.2" + }, "engines": { - "node": ">= 10.0.0" + "node": ">=18.12.0" + } + }, + "node_modules/unplugin-dts": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/unplugin-dts/-/unplugin-dts-1.0.3.tgz", + "integrity": "sha512-/GR887wfG4r1cWyt1UZsLRuMIjsmEbGkS9yJrz+0dsToHAYUD5CTyP3JMGVLv25j9K0mJcwAVvZno/aTuSUvNg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rollup/pluginutils": "^5.1.4", + "@volar/typescript": "^2.4.26", + "compare-versions": "^6.1.1", + "debug": "^4.4.0", + "kolorist": "^1.8.0", + "local-pkg": "^1.1.1", + "magic-string": "^0.30.17", + "unplugin": "^2.3.2" + }, + "peerDependencies": { + "@microsoft/api-extractor": ">=7", + "@rspack/core": "^1", + "@vue/language-core": "^3.1.5", + "esbuild": "*", + "rolldown": "*", + "rollup": ">=3", + "typescript": ">=4", + "vite": ">=3", + "webpack": "^4 || ^5" + }, + "peerDependenciesMeta": { + "@microsoft/api-extractor": { + "optional": true + }, + "@rspack/core": { + "optional": true + }, + "@vue/language-core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "rolldown": { + "optional": true + }, + "rollup": { + "optional": true + }, + "vite": { + "optional": true + }, + "webpack": { + "optional": true + } } }, "node_modules/vite": { @@ -2767,27 +2223,26 @@ } }, "node_modules/vite-plugin-dts": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/vite-plugin-dts/-/vite-plugin-dts-4.5.4.tgz", - "integrity": "sha512-d4sOM8M/8z7vRXHHq/ebbblfaxENjogAAekcfcDCCwAyvGqnPrc7f4NZbvItS+g4WTgerW0xDwSz5qz11JT3vg==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/vite-plugin-dts/-/vite-plugin-dts-5.0.3.tgz", + "integrity": "sha512-gIth6NdCEHWPiiRMCK3N6C8WjvdsrtEQrmsiG8h6Ov+lFP+b07Y+wcs9H0H7n146l0PDTYK4cQN1vgeG1pMdRQ==", "dev": true, "license": "MIT", "dependencies": { - "@microsoft/api-extractor": "^7.50.1", - "@rollup/pluginutils": "^5.1.4", - "@volar/typescript": "^2.4.11", - "@vue/language-core": "2.2.0", - "compare-versions": "^6.1.1", - "debug": "^4.4.0", - "kolorist": "^1.8.0", - "local-pkg": "^1.0.0", - "magic-string": "^0.30.17" + "unplugin-dts": "1.0.3" }, "peerDependencies": { - "typescript": "*", - "vite": "*" + "@microsoft/api-extractor": ">=7", + "rollup": ">=3", + "vite": ">=3" }, "peerDependenciesMeta": { + "@microsoft/api-extractor": { + "optional": true + }, + "rollup": { + "optional": true + }, "vite": { "optional": true } @@ -2913,6 +2368,13 @@ "node": ">=20" } }, + "node_modules/webpack-virtual-modules": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz", + "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==", + "dev": true, + "license": "MIT" + }, "node_modules/whatwg-mimetype": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz", diff --git a/packages/openslides-motion-diff/package.json b/packages/openslides-motion-diff/package.json index eda00dc4fb..8904568a9a 100644 --- a/packages/openslides-motion-diff/package.json +++ b/packages/openslides-motion-diff/package.json @@ -27,7 +27,7 @@ "jsdom": "^29.0.2", "typescript": "^5.8.3", "vite": "^8.0.16", - "vite-plugin-dts": "^4.5.4", + "vite-plugin-dts": "^5.0.3", "vitest": "^4.1.8" }, "dependencies": { From aa21965b7a0be34fe729e69ed4f376bcaef148b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 11:33:08 +0200 Subject: [PATCH 60/71] Bump tar from 7.5.16 to 7.5.20 in /client (#6423) --- client/package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 7dfacb9912..85718e05f4 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -134,7 +134,7 @@ "jsdom": "^29.0.2", "typescript": "^5.8.3", "vite": "^8.0.16", - "vite-plugin-dts": "^4.5.4", + "vite-plugin-dts": "^5.0.3", "vitest": "^4.1.8" } }, @@ -14091,9 +14091,9 @@ } }, "node_modules/tar": { - "version": "7.5.16", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.16.tgz", - "integrity": "sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==", + "version": "7.5.20", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.20.tgz", + "integrity": "sha512-9FcyK4PA6+WbzlTM9WhQm6vB5W7cP7dUiPsv1g7YDwEQnQ1CGpK3MGlKk/ITVWMk05kHZuBhmVhiv8LZoy/PFQ==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { From ef5ba420109f8955f5c551e8ec4c966862686dc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 13:14:38 +0200 Subject: [PATCH 61/71] Bump the typescript-eslint group in /client with 3 updates (#6424) --- client/package-lock.json | 128 +++++++++++++++++++-------------------- client/package.json | 6 +- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 85718e05f4..c0b6c5e1f3 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -93,8 +93,8 @@ "@types/qrcode": "^1.5.6", "@types/tinycolor2": "^1.4.6", "@types/video.js": "^7.3.58", - "@typescript-eslint/eslint-plugin": "^8.64.0", - "@typescript-eslint/parser": "^8.64.0", + "@typescript-eslint/eslint-plugin": "^8.65.0", + "@typescript-eslint/parser": "^8.65.0", "@vendure/ngx-translate-extract": "^10.2.0", "angular-eslint": "^22.1.0", "eslint": "^9.39.5", @@ -117,7 +117,7 @@ "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^6.0.3", - "typescript-eslint": "^8.64.0" + "typescript-eslint": "^8.65.0" } }, "../packages/openslides-motion-diff": { @@ -6218,17 +6218,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.64.0.tgz", - "integrity": "sha512-CGvQPBxN3wZLu6Rz2kFUpZeoCm78xUic92ck39KPePkO1NPOwjCqdQnm5Q87tpWw9vcBvW8XLrDXjH9PWYtJ3Q==", + "version": "8.65.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.65.0.tgz", + "integrity": "sha512-IEgob78X12rHpUmtcwFsXhZdVGJtwTVP8FiCLZkR6GlYVrl2PcuB+KhCE5BlVC/eQpQnu8WXRtkHZuPar+gCRA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.64.0", - "@typescript-eslint/type-utils": "8.64.0", - "@typescript-eslint/utils": "8.64.0", - "@typescript-eslint/visitor-keys": "8.64.0", + "@typescript-eslint/scope-manager": "8.65.0", + "@typescript-eslint/type-utils": "8.65.0", + "@typescript-eslint/utils": "8.65.0", + "@typescript-eslint/visitor-keys": "8.65.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -6241,22 +6241,22 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.64.0", + "@typescript-eslint/parser": "^8.65.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.64.0.tgz", - "integrity": "sha512-KA0OshtlcCCXmbfqyZkM5pV3/WNraJf7DkJRLpyrmwPtud57H5BDX7C3k0LPSPxpprfRL+cJDGabF10mvNCoCw==", + "version": "8.65.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.65.0.tgz", + "integrity": "sha512-CZ4nMxWwgu1HEEFNkeaCptra9QCtkmKdgf3sWh1rl1trIhmxLilgTV4cwcbQ4wemnT4sWQN8CaKOmdYx+g2gMA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.64.0", - "@typescript-eslint/types": "8.64.0", - "@typescript-eslint/typescript-estree": "8.64.0", - "@typescript-eslint/visitor-keys": "8.64.0", + "@typescript-eslint/scope-manager": "8.65.0", + "@typescript-eslint/types": "8.65.0", + "@typescript-eslint/typescript-estree": "8.65.0", + "@typescript-eslint/visitor-keys": "8.65.0", "debug": "^4.4.3" }, "engines": { @@ -6272,14 +6272,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.64.0.tgz", - "integrity": "sha512-tk4WpOJ6IEbGrVHaNmM0YRrwAD3exZlIK3iadQNAxh4YKk6jvUQ4ecq18n+v7+meh+cJ3j+D8nbk8sRKhlwLQg==", + "version": "8.65.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.65.0.tgz", + "integrity": "sha512-SxnPhbTsGahizDgbu7oqFH/xVtzIqMd/s+WtnSxNxJZJpLbdT5IPdzg8EZxO3+PoKahXmwJLeNQOpKJb3/bi7Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.64.0", - "@typescript-eslint/types": "^8.64.0", + "@typescript-eslint/tsconfig-utils": "^8.65.0", + "@typescript-eslint/types": "^8.65.0", "debug": "^4.4.3" }, "engines": { @@ -6294,14 +6294,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.64.0.tgz", - "integrity": "sha512-CXEaFdYXjSTgKhisNkwCcJwTP8Pl+fmRrEQrri4nm3vU743bALrxzLmq7fHG/7e6a5xO0lDYeURpZmBuhHk54w==", + "version": "8.65.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.65.0.tgz", + "integrity": "sha512-Esbl8OSYiVxBokYgWPf7VVWg/BE798wXhimnn9ML9Pt5qoDf8bfQlgjlKXR/k98+AcNzlLKYrpCcrcuZ9DZLgg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.64.0", - "@typescript-eslint/visitor-keys": "8.64.0" + "@typescript-eslint/types": "8.65.0", + "@typescript-eslint/visitor-keys": "8.65.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6312,9 +6312,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.64.0.tgz", - "integrity": "sha512-2yo8rRNKuzbVWQp5kslhANqZ2uDAeROQHBRZNPu8JDsHmeFNj/XJJhX/FhNUWmkHHvoNsKa6+tHJiig87EzsQw==", + "version": "8.65.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.65.0.tgz", + "integrity": "sha512-j6GzGqCiRdA7Qhur2VVmKZAkBLfnHFQfx4TaJGL9RMveZqCo48jSHHO0DTgizEnGhtWnqmbtCUSrqSkdiY/0Hg==", "dev": true, "license": "MIT", "engines": { @@ -6329,15 +6329,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.64.0.tgz", - "integrity": "sha512-XWG4Fmmv/6SvyS9nH8jWrKs6terwJvE8cyRt1CzYYqzp9OrPhCT4cMc/f7C6RZCwG+qMmiffJS1/qJP8G1URtg==", + "version": "8.65.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.65.0.tgz", + "integrity": "sha512-YjaZ7PRI5qY7ax2L3PbvX0rRyGtipAReCWs0mhhDBHjH/vl0g0BonaGXrKdKpMbIIsMIwDgbk/xzkBTyAltS5g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.64.0", - "@typescript-eslint/typescript-estree": "8.64.0", - "@typescript-eslint/utils": "8.64.0", + "@typescript-eslint/types": "8.65.0", + "@typescript-eslint/typescript-estree": "8.65.0", + "@typescript-eslint/utils": "8.65.0", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -6354,9 +6354,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.64.0.tgz", - "integrity": "sha512-qjhfuTfLXjA4IOzXvz0rTjT01BqEiIgPoUeMwiEjnaHKJMTNo8rH5pYW1a2L/0Dnux2fPC85AeyJoWaGa8WxTA==", + "version": "8.65.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.65.0.tgz", + "integrity": "sha512-JSSwWNy+H0E/01jJEM+hrX6N0OFDzFzeIhHFSAS01tlVaevpG8cFyYRPhS5yjGOvBUx3sqQHVMjCL1CAZZMxBg==", "dev": true, "license": "MIT", "engines": { @@ -6368,16 +6368,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.64.0.tgz", - "integrity": "sha512-Pztpsn1aCE1oWDvDEfUk31nngvvF7vUB5SwHFEaZIFpvw7WJtqUHHL4plBZDA9HfWJJjL13BdG0YrJInTUvoVA==", + "version": "8.65.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.65.0.tgz", + "integrity": "sha512-JboAE2swaYt4tb1fHhHTABE2K+OLy09XfcTbhnk4Pw96f9dd2e9iYsJ28gBggHlo5z5x1rkyWvcPoTuNTd4oGg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.64.0", - "@typescript-eslint/tsconfig-utils": "8.64.0", - "@typescript-eslint/types": "8.64.0", - "@typescript-eslint/visitor-keys": "8.64.0", + "@typescript-eslint/project-service": "8.65.0", + "@typescript-eslint/tsconfig-utils": "8.65.0", + "@typescript-eslint/types": "8.65.0", + "@typescript-eslint/visitor-keys": "8.65.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -6396,16 +6396,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.64.0.tgz", - "integrity": "sha512-aJUGVB3+U0htrrCjoA8qukw8cm8fNCGAxK/tVoS70k8aeb7DETKeFozRiVFIwEeN9WJLsjaP3ph8I60tY2XZoQ==", + "version": "8.65.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.65.0.tgz", + "integrity": "sha512-gXiwIHsYreboxeJucHKPvgwl7dXt50mF8s1/c00cP/WoVTyWKFdtfhRWwZiXYFU5H2O8vVoSLNrexFZjYS/SGA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.64.0", - "@typescript-eslint/types": "8.64.0", - "@typescript-eslint/typescript-estree": "8.64.0" + "@typescript-eslint/scope-manager": "8.65.0", + "@typescript-eslint/types": "8.65.0", + "@typescript-eslint/typescript-estree": "8.65.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -6420,13 +6420,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.64.0.tgz", - "integrity": "sha512-mrtuL8Nsn6gi2H4mo5KMTp823M+3Q19Ew/i+Zlikq20tIMm99C3Ez0dCmkWWnxut20esQvTg8aUSEhMcAOXhEw==", + "version": "8.65.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.65.0.tgz", + "integrity": "sha512-8C71BQkGjiMmXtop7pHVJu1l2NNShFdkCyD6a2ezzs5vU/L3LRtb69EtcteFwz0mYMPzIgOw0n6OV4VBUWZd7A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.64.0", + "@typescript-eslint/types": "8.65.0", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -14359,16 +14359,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.64.0.tgz", - "integrity": "sha512-0qg+pDNMnqYzqH9AnNK+39tejHvsShUOUUoRUgtnTGE7QuMZhiFDnozq8nHJVq+Wae6NMLKNWLg5WmkcC/ndyQ==", + "version": "8.65.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.65.0.tgz", + "integrity": "sha512-/ggrHAwyjENDusvyxbuqxAC2dTnZg/Z8F+fgQtYIz+L6n/9HfSlEZcFGV/NsMNa6CkGk0xUjUAFwC0vHOflvIA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.64.0", - "@typescript-eslint/parser": "8.64.0", - "@typescript-eslint/typescript-estree": "8.64.0", - "@typescript-eslint/utils": "8.64.0" + "@typescript-eslint/eslint-plugin": "8.65.0", + "@typescript-eslint/parser": "8.65.0", + "@typescript-eslint/typescript-estree": "8.65.0", + "@typescript-eslint/utils": "8.65.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" diff --git a/client/package.json b/client/package.json index 80fb6f8f15..0af79c6d5c 100644 --- a/client/package.json +++ b/client/package.json @@ -116,8 +116,8 @@ "@types/qrcode": "^1.5.6", "@types/tinycolor2": "^1.4.6", "@types/video.js": "^7.3.58", - "@typescript-eslint/eslint-plugin": "^8.64.0", - "@typescript-eslint/parser": "^8.64.0", + "@typescript-eslint/eslint-plugin": "^8.65.0", + "@typescript-eslint/parser": "^8.65.0", "@vendure/ngx-translate-extract": "^10.2.0", "angular-eslint": "^22.1.0", "eslint": "^9.39.5", @@ -140,7 +140,7 @@ "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", "typescript": "^6.0.3", - "typescript-eslint": "^8.64.0" + "typescript-eslint": "^8.65.0" }, "browser": { "fs": false From 2c4c292eff63f7d6133729f0547cbc6173e73bf1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 13:15:21 +0200 Subject: [PATCH 62/71] Bump the angular group in /client with 16 updates (#6425) --- client/package-lock.json | 304 +++++++++++++++++---------------------- client/package.json | 32 ++--- 2 files changed, 144 insertions(+), 192 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index c0b6c5e1f3..97f1e0502d 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -9,18 +9,18 @@ "version": "4.2.x-dev", "license": "MIT", "dependencies": { - "@angular/animations": "^22.0.6", - "@angular/cdk": "^22.0.4", - "@angular/common": "^22.0.6", - "@angular/compiler": "^22.0.6", - "@angular/core": "^22.0.6", - "@angular/forms": "^22.0.6", - "@angular/material": "^22.0.4", - "@angular/material-date-fns-adapter": "^22.0.4", - "@angular/platform-browser": "^22.0.6", - "@angular/platform-browser-dynamic": "^22.0.6", - "@angular/router": "^22.0.6", - "@angular/service-worker": "^22.0.6", + "@angular/animations": "^22.0.7", + "@angular/cdk": "^22.0.5", + "@angular/common": "^22.0.7", + "@angular/compiler": "^22.0.7", + "@angular/core": "^22.0.7", + "@angular/forms": "^22.0.7", + "@angular/material": "^22.0.5", + "@angular/material-date-fns-adapter": "^22.0.5", + "@angular/platform-browser": "^22.0.7", + "@angular/platform-browser-dynamic": "^22.0.7", + "@angular/router": "^22.0.7", + "@angular/service-worker": "^22.0.7", "@cantoo/pdf-lib": "^2.7.2", "@coreui/angular-chartjs": "~5.7.4", "@coreui/chartjs": "^4.1.0", @@ -80,10 +80,10 @@ "@angular-eslint/eslint-plugin-template": "^22.1.0", "@angular-eslint/schematics": "^22.1.0", "@angular-eslint/template-parser": "^22.1.0", - "@angular/build": "^22.0.6", - "@angular/cli": "^22.0.6", - "@angular/compiler-cli": "^22.0.6", - "@angular/language-server": "^22.0.6", + "@angular/build": "^22.0.7", + "@angular/cli": "^22.0.7", + "@angular/compiler-cli": "^22.0.7", + "@angular/language-server": "^22.0.7", "@stylistic/eslint-plugin": "^5.10.0", "@types/file-saver": "^2.0.7", "@types/jasmine": "~5.1.15", @@ -362,13 +362,13 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.2200.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2200.6.tgz", - "integrity": "sha512-wTjUfiT5iEMc9+9z2zo1QGtzLpXk5Xx0bV6/zTO4n6+BCC0qReuYnIYt0iJCh649Q0vHq5++0zmZZK0KyXVMZQ==", + "version": "0.2200.7", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.2200.7.tgz", + "integrity": "sha512-t03YYe5amlcpsX5gpMGi96kpBNTMKY7/rJsRDNO3v98mSy7kzNXlgzy/jyfdFev7AJusuwVM5TKVsUAgQxCgCw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "22.0.6", + "@angular-devkit/core": "22.0.7", "rxjs": "7.8.2" }, "bin": { @@ -381,9 +381,9 @@ } }, "node_modules/@angular-devkit/core": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-22.0.6.tgz", - "integrity": "sha512-uAZ7TPn+8sDZcFtiM5nQpmqaR9lspLAf7RY7t7TXYP794001khRf+F/AhmONxmgFPWY01+eeJSvBx+FEnHCb0A==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-22.0.7.tgz", + "integrity": "sha512-r8XiflsVYcsvWp+zVvaNv5GsDoihaZ2OwWfn++N6YqTUZLcqDzqhsxeNk60sJ5V+Jn4ck1aKF4A9flmvSY+tpQ==", "dev": true, "license": "MIT", "dependencies": { @@ -409,13 +409,13 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-22.0.6.tgz", - "integrity": "sha512-7bSiye4UrxvhYvYp1YIpVSVOFQZ75EXP3EE5/ShM3cPNtUTdXJiwHkD8SiLHNhPTB6Mzrq5tp1YlAXXRg/WgLw==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-22.0.7.tgz", + "integrity": "sha512-bKgnBB0LPAj44uVXfW0UO1rQBb3HGXDZxa1bLtESr/KCK4j5iiaXlHqvJjc/z0em1Ds9WNQOfNXjV3IdJo9sSw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "22.0.6", + "@angular-devkit/core": "22.0.7", "jsonc-parser": "3.3.1", "magic-string": "0.30.21", "ora": "9.4.0", @@ -569,9 +569,9 @@ } }, "node_modules/@angular/animations": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-22.0.6.tgz", - "integrity": "sha512-5bBAuKtawVK4KPq6U/yoE5yCyKymEnXNN7UJ1Lb7PUuuYmLnUXb7zJpC7HwtHTuV/0PTCkGlLE59NtcrrolTuA==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-22.0.7.tgz", + "integrity": "sha512-Q9PS2SYyvY4/K90GGy4+F0X7X7YmEfzKOw3eGgJ+6MnpVFo2kII2WK/bI5spr3PWNrn/TvNNNqP//c8BNX2Lbg==", "deprecated": "@angular/animations is deprecated. Use `animate.enter` and `animate.leave` instead. For more information see: https://v22.angular.dev/guide/animations.", "license": "MIT", "dependencies": { @@ -581,20 +581,20 @@ "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/core": "22.0.6" + "@angular/core": "22.0.7" } }, "node_modules/@angular/build": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-22.0.6.tgz", - "integrity": "sha512-mIp1snH1haw4pKiJwUmKyp9f31NRUTeUwqrl9W59X3Iv54egOnD1EdCc0jsW7WJVr/JHRZYVt/ooFelUB8uV8g==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-22.0.7.tgz", + "integrity": "sha512-cm/QJmrIgsjzZJeBeqeNwgdgK6BGBKk7ca21jnSsrwlae3F9u1E8cImFbLeZSjEGghx4wFUacFDG+6lFEICntw==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.2200.6", - "@babel/core": "7.29.0", - "@babel/helper-annotate-as-pure": "7.27.3", + "@angular-devkit/architect": "0.2200.7", + "@babel/core": "7.29.7", + "@babel/helper-annotate-as-pure": "7.29.7", "@babel/helper-split-export-declaration": "7.24.7", "@inquirer/confirm": "6.0.12", "@vitejs/plugin-basic-ssl": "2.3.0", @@ -633,7 +633,7 @@ "@angular/platform-browser": "^22.0.0", "@angular/platform-server": "^22.0.0", "@angular/service-worker": "^22.0.0", - "@angular/ssr": "^22.0.6", + "@angular/ssr": "^22.0.7", "istanbul-lib-instrument": "^6.0.0", "karma": "^6.4.0", "less": "^4.2.0", @@ -1195,9 +1195,9 @@ } }, "node_modules/@angular/cdk": { - "version": "22.0.4", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-22.0.4.tgz", - "integrity": "sha512-XaH1ff9tOn4acPh0zWbrmJznfZqZ0KZkw5+DM5BIeM9URmAOI8xdZWmVNyaUpVSmriANFjeGZS+Sfat9S6hLOg==", + "version": "22.0.5", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-22.0.5.tgz", + "integrity": "sha512-qy1scYkkhedGxrU2GjOUoh76xjsxCDOODWdVfg4aXLXG7RBIH6hOuKdcNpR/sWhfSdY02a11QYRN2CqoqWDvZQ==", "license": "MIT", "dependencies": { "parse5": "^8.0.0", @@ -1211,19 +1211,19 @@ } }, "node_modules/@angular/cli": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-22.0.6.tgz", - "integrity": "sha512-/sEN1hVcywSML+yWrr/T7gbuGfIrZwKC+WhiOv5GksSQVUrSujWnMX4meRJ5ocG/Ie8UN48LJ7LVDsm32NBt1A==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-22.0.7.tgz", + "integrity": "sha512-5r+fgP8ARnXZeylAGt5BuToVcR8Vn2QQZ6dPMe7V9o4NdvJqqOKmE7fEiRe7KaxIx5WSDhuAhgW9t+scLZQbvw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.2200.6", - "@angular-devkit/core": "22.0.6", - "@angular-devkit/schematics": "22.0.6", + "@angular-devkit/architect": "0.2200.7", + "@angular-devkit/core": "22.0.7", + "@angular-devkit/schematics": "22.0.7", "@inquirer/prompts": "8.4.2", "@listr2/prompt-adapter-inquirer": "4.2.3", "@modelcontextprotocol/sdk": "1.29.0", - "@schematics/angular": "22.0.6", + "@schematics/angular": "22.0.7", "@yarnpkg/lockfile": "1.1.0", "algoliasearch": "5.52.0", "ini": "6.0.0", @@ -1246,9 +1246,9 @@ } }, "node_modules/@angular/common": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-22.0.6.tgz", - "integrity": "sha512-+sC0W0FWGeZ/HKUhueCBX8kXdFQDlStbUSK6WF/32igfNYR/PdUrp2L5bU7q654yjxnMzFWDAB+Uvzv6YI/cQg==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-22.0.7.tgz", + "integrity": "sha512-iun8auXVnpPzunhtaPHMF0gSpByxv7kHhG3Nb6r34eJITW5p06LYyZbkAnl5ERArmgQvEV4pTjoo7ZTK3cJzzw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -1257,14 +1257,14 @@ "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/core": "22.0.6", + "@angular/core": "22.0.7", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-22.0.6.tgz", - "integrity": "sha512-iFHsXOA14TsxK4jowmGfogI9Jb0ApL3z8EGTGvKMialqtw088HYjwJP1LT4OlO/wgmjSTq2peZ19jLPuhevNvw==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-22.0.7.tgz", + "integrity": "sha512-zhFPKYJzpml5bt58DkJq8S6S2bSJBomebgLYtUvZNLdQMicd5qmRGX6I3LO7Jd+HgjB2Flne/sloI+Jcyz1aOQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -1274,9 +1274,9 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-22.0.6.tgz", - "integrity": "sha512-HPiceCIEyIcTmOuIFiyqu04kbLoJhSUavcOy/kzJkJ2OPXtPvGKaimC4lgs0C86uFy4P6rj6PDITBe3AVHkMTA==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-22.0.7.tgz", + "integrity": "sha512-/3HjBJUzljyPgb77R679+FN1+27xIGuLCAhuqzfj6DxX5WJOOmQOWE/k12eAZujE+ZypSf8ZGkfaukZV43FwoA==", "dev": true, "license": "MIT", "dependencies": { @@ -1297,7 +1297,7 @@ "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/compiler": "22.0.6", + "@angular/compiler": "22.0.7", "typescript": ">=6.0 <6.1" }, "peerDependenciesMeta": { @@ -1306,58 +1306,10 @@ } } }, - "node_modules/@angular/compiler-cli/node_modules/@babel/core": { - "version": "7.29.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz", - "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.29.7", - "@babel/generator": "^7.29.7", - "@babel/helper-compilation-targets": "^7.29.7", - "@babel/helper-module-transforms": "^7.29.7", - "@babel/helpers": "^7.29.7", - "@babel/parser": "^7.29.7", - "@babel/template": "^7.29.7", - "@babel/traverse": "^7.29.7", - "@babel/types": "^7.29.7", - "@jridgewell/remapping": "^2.3.5", - "convert-source-map": "^2.0.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.2.3", - "semver": "^6.3.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@angular/core": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-22.0.6.tgz", - "integrity": "sha512-9AYGxmZlJhjLSepZaF/cn1LTC9xRHpUPtXlyyJdauTb4f77X/P0kVdmADztgF1Qy5oMd1V9UKebAe81gmqOH2g==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-22.0.7.tgz", + "integrity": "sha512-A5xKJx5wuuZfeJhShyZvbgicYtT3Jpw/5wJd1cfrcKU+i63CagRIg9jSktTW/e+2hxG1tIQrfKQUGeclmsAUUA==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -1366,7 +1318,7 @@ "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/compiler": "22.0.6", + "@angular/compiler": "22.0.7", "rxjs": "^6.5.3 || ^7.4.0", "zone.js": "~0.15.0 || ~0.16.0" }, @@ -1380,9 +1332,9 @@ } }, "node_modules/@angular/forms": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-22.0.6.tgz", - "integrity": "sha512-pZGMk1TvT+m8z2ZGm90W0sBlo6fhtMAA2baZbMt3HbGRmY23vZv1Orv9npX3Z6a9CCNDY3XBMBvkuj8g7vde9Q==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-22.0.7.tgz", + "integrity": "sha512-24ldrCORVCi3SoqtshjD8PcT5zg4aIXy9p8+GsO/c3yuhAouVOwL4z1/btNdo7UZv1asyaT3w4lgzprN8TGpjA==", "license": "MIT", "dependencies": { "@standard-schema/spec": "^1.0.0", @@ -1393,20 +1345,20 @@ "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/common": "22.0.6", - "@angular/core": "22.0.6", - "@angular/platform-browser": "22.0.6", + "@angular/common": "22.0.7", + "@angular/core": "22.0.7", + "@angular/platform-browser": "22.0.7", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/language-server": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/language-server/-/language-server-22.0.6.tgz", - "integrity": "sha512-3wLhBdF/9GgW7Y4fKyW7e9TKyRC2firP9akb6Xd1TajqQzDxExdbKo+bBLML+njKWcOCknUAqR6OBNpDl/IrPA==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/language-server/-/language-server-22.0.7.tgz", + "integrity": "sha512-bjW+Rzh/cY3q8I0Ss5M07GMmDLiNxREPLnnqe4W2u9TPvBEHZjJLU7tWMgdmBfxndZFEfF5ij4vCpSdSJ9mlbw==", "dev": true, "license": "MIT", "dependencies": { - "@angular/language-service": "22.0.6", + "@angular/language-service": "22.0.7", "typescript": "6.0.3" }, "bin": { @@ -1417,9 +1369,9 @@ } }, "node_modules/@angular/language-service": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-22.0.6.tgz", - "integrity": "sha512-98+yuUDyt472Z5vUEQs2YFqeF+ET2YQIWsdbhp9gTAE/oCEfnPTV9iyvqqry79UpBH0ivGeBs2ISD1QUkKsWrA==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-22.0.7.tgz", + "integrity": "sha512-IT2CSgrb26S2SlVhWfCe0VHjv3Tdh5BG0W7LmFn1SWeQZQmUpKwyy+3pvCh3OKIUeNfqd4YNznIv8Vslnpof1A==", "dev": true, "license": "MIT", "engines": { @@ -1427,15 +1379,15 @@ } }, "node_modules/@angular/material": { - "version": "22.0.4", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-22.0.4.tgz", - "integrity": "sha512-htOFlTwMtcB9J4q6yPD9jJIQVJ5LfRub+KAiD4D7UU1iaCknpNuQKRfLrZh/mEdOVACI52jHAOXS3+eTkloXcQ==", + "version": "22.0.5", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-22.0.5.tgz", + "integrity": "sha512-A0SnDMvWQBxv3dB2w33GXwuo1/puKtFe8ZMQmIiurS5bbTQpV7UHAM0pWzg7L4DG2cvaH4WZGRPfNG3f8fh+yA==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/cdk": "22.0.4", + "@angular/cdk": "22.0.5", "@angular/common": "^22.0.0 || ^23.0.0", "@angular/core": "^22.0.0 || ^23.0.0", "@angular/forms": "^22.0.0 || ^23.0.0", @@ -1444,23 +1396,23 @@ } }, "node_modules/@angular/material-date-fns-adapter": { - "version": "22.0.4", - "resolved": "https://registry.npmjs.org/@angular/material-date-fns-adapter/-/material-date-fns-adapter-22.0.4.tgz", - "integrity": "sha512-0TZf1eByXqPbDyXldzqxF4PSPw/x1HtjpBdKVe4QjXFxlFVaSymRWr+Xwks0UVL+QzddZWk8TS+dcU462eeZ6g==", + "version": "22.0.5", + "resolved": "https://registry.npmjs.org/@angular/material-date-fns-adapter/-/material-date-fns-adapter-22.0.5.tgz", + "integrity": "sha512-TXag0QF9CwR5jR0dvX7wt23nk1Ck2EmfJg/xR/RI4HfHRz+1qiHhZ9K8oqU/37hGfFUCdL137hFw3OAMVYaywQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/core": "^22.0.0 || ^23.0.0", - "@angular/material": "22.0.4", + "@angular/material": "22.0.5", "date-fns": ">2.20.0 <5.0" } }, "node_modules/@angular/platform-browser": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-22.0.6.tgz", - "integrity": "sha512-DyyYRx4jXlfaenf0mwsp9jcIak/c17QCFgJKA7OauSkQnk3dL+voMYEwdigfnTIUdw+2Y9wYDywLeuM6NychNQ==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-22.0.7.tgz", + "integrity": "sha512-iCuREIWRnDCsd7mI5vn5ovXjcSwseWR4qfd+zo6QUrY2O9zkUNV79YuCqVjSzvWyvU2rtR5iRBvpB5JQgBELeg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -1469,9 +1421,9 @@ "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/animations": "22.0.6", - "@angular/common": "22.0.6", - "@angular/core": "22.0.6" + "@angular/animations": "22.0.7", + "@angular/common": "22.0.7", + "@angular/core": "22.0.7" }, "peerDependenciesMeta": { "@angular/animations": { @@ -1480,9 +1432,9 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-22.0.6.tgz", - "integrity": "sha512-VKf8mg+BviBp3wlElZYxWFuXtMLQqd8rfm6jEzwP1Emaz2MCx69Y54dXopD81KJCqRwTmJUVxOjoubqUOlJzRw==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-22.0.7.tgz", + "integrity": "sha512-FssnDZLIOYBsUO9EF4oHPHaNZyyCptVV0wYlGV5TlMWEJ6R3UllynUiQi03Zqyg344azgbPr2ieW3qoz0PAbsQ==", "deprecated": "@angular/platform-browser-dynamic is deprecated. Use `@angular/platform-browser` instead.", "license": "MIT", "dependencies": { @@ -1492,16 +1444,16 @@ "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/common": "22.0.6", - "@angular/compiler": "22.0.6", - "@angular/core": "22.0.6", - "@angular/platform-browser": "22.0.6" + "@angular/common": "22.0.7", + "@angular/compiler": "22.0.7", + "@angular/core": "22.0.7", + "@angular/platform-browser": "22.0.7" } }, "node_modules/@angular/router": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-22.0.6.tgz", - "integrity": "sha512-s0BErBBadCXlvilob8aWke4H1FRlXDbnDfyYkjW6RkUaGQ4jzeEAzH56KsG2hf8NtBtYwkRlsLfOX9s5sPwm6w==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-22.0.7.tgz", + "integrity": "sha512-uMh+2S5y5Z6hTeFL85tDehfqAwVYjnTlHxpCrW+75RD4Z+rLl0/ff2ag3bXknzNyg0Q9LPOH6t/eCcQYajNOQQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -1510,16 +1462,16 @@ "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/common": "22.0.6", - "@angular/core": "22.0.6", - "@angular/platform-browser": "22.0.6", + "@angular/common": "22.0.7", + "@angular/core": "22.0.7", + "@angular/platform-browser": "22.0.7", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/service-worker": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-22.0.6.tgz", - "integrity": "sha512-s0zE2MFVptHNd21c5sD2VXd9Dp5x6cgyDjIePKjRsfiILegX3i6pAj9xeZ6y160dsrLVmkHST+uY+oxOVMVUhg==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-22.0.7.tgz", + "integrity": "sha512-Xd47hbaVZvkA4wcXBY570rkfX2eONyUfV15vgPx18bKrmPFlat7Fj75PCWIMn90Tg31BLtuozTZenGGjQXSy4g==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -1531,7 +1483,7 @@ "node": "^22.22.3 || ^24.15.0 || >=26.0.0" }, "peerDependencies": { - "@angular/core": "22.0.6", + "@angular/core": "22.0.7", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -1561,21 +1513,21 @@ } }, "node_modules/@babel/core": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz", - "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz", + "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.29.0", - "@babel/generator": "^7.29.0", - "@babel/helper-compilation-targets": "^7.28.6", - "@babel/helper-module-transforms": "^7.28.6", - "@babel/helpers": "^7.28.6", - "@babel/parser": "^7.29.0", - "@babel/template": "^7.28.6", - "@babel/traverse": "^7.29.0", - "@babel/types": "^7.29.0", + "@babel/code-frame": "^7.29.7", + "@babel/generator": "^7.29.7", + "@babel/helper-compilation-targets": "^7.29.7", + "@babel/helper-module-transforms": "^7.29.7", + "@babel/helpers": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/template": "^7.29.7", + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7", "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", @@ -1626,13 +1578,13 @@ } }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.27.3", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz", - "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.29.7.tgz", + "integrity": "sha512-OoK6239jHPuSQOoS0kfTVKn0b/rVTk0seKq4Gd2UMLtmOVLjDC0ki3e+c90Trqv2gMfvJFqkiljrr568+qddiw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.27.3" + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -4902,14 +4854,14 @@ ] }, "node_modules/@schematics/angular": { - "version": "22.0.6", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-22.0.6.tgz", - "integrity": "sha512-pZP52HlQaILmFKK4/iA2OyQ7mMP2V/K6z3gxbykWgXk/MNJ605PWaptHZOuvAAp+0qsFWJbj0MLmDdR3yMhdMQ==", + "version": "22.0.7", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-22.0.7.tgz", + "integrity": "sha512-/GVLhB5zaxYGIaC4GFfsfk81SDq9ht0HbEHhHB+t1SqNPV8gnULDV2ZE0Cg+LGj+3YnPtSwpb7tS0vaHUcihVg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "22.0.6", - "@angular-devkit/schematics": "22.0.6", + "@angular-devkit/core": "22.0.7", + "@angular-devkit/schematics": "22.0.7", "jsonc-parser": "3.3.1", "typescript": "6.0.3" }, diff --git a/client/package.json b/client/package.json index 0af79c6d5c..15edf4a1d4 100644 --- a/client/package.json +++ b/client/package.json @@ -32,18 +32,18 @@ "get-available-languages": "npm run ts -- cli/get-available-languages.ts" }, "dependencies": { - "@angular/animations": "^22.0.6", - "@angular/cdk": "^22.0.4", - "@angular/common": "^22.0.6", - "@angular/compiler": "^22.0.6", - "@angular/core": "^22.0.6", - "@angular/forms": "^22.0.6", - "@angular/material": "^22.0.4", - "@angular/material-date-fns-adapter": "^22.0.4", - "@angular/platform-browser": "^22.0.6", - "@angular/platform-browser-dynamic": "^22.0.6", - "@angular/router": "^22.0.6", - "@angular/service-worker": "^22.0.6", + "@angular/animations": "^22.0.7", + "@angular/cdk": "^22.0.5", + "@angular/common": "^22.0.7", + "@angular/compiler": "^22.0.7", + "@angular/core": "^22.0.7", + "@angular/forms": "^22.0.7", + "@angular/material": "^22.0.5", + "@angular/material-date-fns-adapter": "^22.0.5", + "@angular/platform-browser": "^22.0.7", + "@angular/platform-browser-dynamic": "^22.0.7", + "@angular/router": "^22.0.7", + "@angular/service-worker": "^22.0.7", "@cantoo/pdf-lib": "^2.7.2", "@coreui/angular-chartjs": "~5.7.4", "@coreui/chartjs": "^4.1.0", @@ -103,10 +103,10 @@ "@angular-eslint/eslint-plugin-template": "^22.1.0", "@angular-eslint/schematics": "^22.1.0", "@angular-eslint/template-parser": "^22.1.0", - "@angular/build": "^22.0.6", - "@angular/cli": "^22.0.6", - "@angular/compiler-cli": "^22.0.6", - "@angular/language-server": "^22.0.6", + "@angular/build": "^22.0.7", + "@angular/cli": "^22.0.7", + "@angular/compiler-cli": "^22.0.7", + "@angular/language-server": "^22.0.7", "@stylistic/eslint-plugin": "^5.10.0", "@types/file-saver": "^2.0.7", "@types/jasmine": "~5.1.15", From 090a97a1e10287dab23d5c959e848617aea678e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 13:15:29 +0200 Subject: [PATCH 63/71] Bump the tiptap group in /client with 15 updates (#6426) --- client/package-lock.json | 386 +++++++++++++++++++-------------------- client/package.json | 20 +- 2 files changed, 203 insertions(+), 203 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 97f1e0502d..f9f7850068 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -31,21 +31,21 @@ "@ngx-translate/core": "^17.0.0", "@ngx-translate/http-loader": "^17.0.0", "@openslides/motion-diff": "file:../packages/openslides-motion-diff", - "@tiptap/core": "^3.27.4", + "@tiptap/core": "^3.28.0", "@tiptap/extension-blockquote": "^3.27.4", - "@tiptap/extension-color": "^3.27.4", - "@tiptap/extension-highlight": "^3.27.4", - "@tiptap/extension-image": "^3.27.4", + "@tiptap/extension-color": "^3.28.0", + "@tiptap/extension-highlight": "^3.28.0", + "@tiptap/extension-image": "^3.28.0", "@tiptap/extension-link": "^3.23.4", "@tiptap/extension-list": "^3.22.4", - "@tiptap/extension-subscript": "^3.27.4", - "@tiptap/extension-superscript": "^3.27.4", - "@tiptap/extension-table": "^3.27.4", - "@tiptap/extension-text-align": "^3.27.4", + "@tiptap/extension-subscript": "^3.28.0", + "@tiptap/extension-superscript": "^3.28.0", + "@tiptap/extension-table": "^3.28.0", + "@tiptap/extension-text-align": "^3.28.0", "@tiptap/extension-text-style": "^3.4.2", "@tiptap/extensions": "^3.22.4", - "@tiptap/pm": "^3.27.3", - "@tiptap/starter-kit": "^3.27.4", + "@tiptap/pm": "^3.28.0", + "@tiptap/starter-kit": "^3.28.0", "@tsparticles/angular": "^3.0.0", "@tsparticles/engine": "^3.9.1", "@tsparticles/plugin-emitters": "^3.9.1", @@ -4995,192 +4995,220 @@ } }, "node_modules/@tiptap/core": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.27.4.tgz", - "integrity": "sha512-8W/GwlEn0JwNdpyVfTWcXwHYUpj9BWwO++YxtizmgjJzlwigSh7/xLVJMwVykuQHQ2fCq5rkUvmBRtpHOMLUQA==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.28.0.tgz", + "integrity": "sha512-gUuD5WAYfbDxNSSJya/emh2KSzXZXLUYKW4fEnc1AQ5FE2twzh4LJ9UlKFIawigrUCAksWI5Fy1hRbv+5m4ZdQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/pm": "3.27.4" + "@tiptap/pm": "3.28.0" } }, "node_modules/@tiptap/extension-blockquote": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.27.4.tgz", - "integrity": "sha512-d1tOHgP3R5cOE+Ot8qL/dkLXRByajgn+j6cCXHqDtmJO2wsK9knmbKQ0SEjbKrU6OgHrTnY/EotNxBEBW9HGoA==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-blockquote/-/extension-blockquote-3.28.0.tgz", + "integrity": "sha512-y8Xi6Z3AQLXedz0J8Z3kDsu7SKBmL50gKVXx3RK1Oo1cuCGhNChm3syChkAz3PLAbrPUM5rvJDSZdF2jUrDnng==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4", - "@tiptap/pm": "3.27.4" + "@tiptap/core": "3.28.0", + "@tiptap/pm": "3.28.0" } }, "node_modules/@tiptap/extension-bold": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.27.4.tgz", - "integrity": "sha512-wTtJUUAxCAZ01ICH2DNlOBzzHKRQ1ZST8aRYtIhBPzqEUhnJaKGcjnDB4X49fqPi48iXaPxzhsInDl+rVUujWg==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bold/-/extension-bold-3.28.0.tgz", + "integrity": "sha512-JhZQmr0AU741bOwjVMfuwJdK4g0TQwwPbeca9aqKHv5zvZw4i4G9G6fESVyMFc3Yag1ffpnq5EtNldHKTnMhlw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" } }, "node_modules/@tiptap/extension-bullet-list": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.27.4.tgz", - "integrity": "sha512-rvja0N1RnwGJAVwDdbUfDIJ4NoT+KjPFaZudKiPuEMfMHfbqe4xcbbC2hsfs61JNcl2xmx+ohV6lzD9YxxJl1w==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-bullet-list/-/extension-bullet-list-3.28.0.tgz", + "integrity": "sha512-dSVuNiH7PFMmWGkNER9vfUb5bXUHDARvHbJ3l+APEb+ZiusVN1KFdM3nd/RsW/Rt5Gd3XwlIEU/c2Uf7cxYDcw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.4" + "@tiptap/extension-list": "3.28.0" } }, "node_modules/@tiptap/extension-code": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.27.4.tgz", - "integrity": "sha512-aPc7opCR1ylK4m4c2lsjLsGpEBD1fLQQKWd5PbZiJvrTF8gkdGZlYLt9A6VukpxeJyHhb22Jaj4fxgKmGMeTtw==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-code/-/extension-code-3.28.0.tgz", + "integrity": "sha512-AUw2Acof3CQE6Q6Y22saK4lyg0nkeJ4XXniU65TdAi/9TE66TGiO4NQJJNNPgu8+VMEwl5j8VsIFK8sfTcNYtg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" + } + }, + "node_modules/@tiptap/extension-code-block": { + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.28.0.tgz", + "integrity": "sha512-bHITDzT0umTLh+SiEVQzIXkCMt/TzbPM1+HQy9ZxgQDHAJj/vdmfNAnP3RCOrz4lETXyhNQ2b6kxeu3lWckxyA==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/ueberdosis" + }, + "peerDependencies": { + "@tiptap/core": "3.28.0", + "@tiptap/pm": "3.28.0" } }, "node_modules/@tiptap/extension-color": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-color/-/extension-color-3.27.4.tgz", - "integrity": "sha512-uGbgErKGKO4OTBGqnXOA1CGXa3IqoBaiPBGcHu/px01fS8EVFu0A7q5HS6vxFiMK6qW5x71sEpCA+FUINMAb3g==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-color/-/extension-color-3.28.0.tgz", + "integrity": "sha512-YbUMUdrgU04GDYoii1wuFVkiTSQoaEQh04kwgQayEQ46aUBEnnaJitWdp39aGMWYTIXD/c9K9cr5Vg8GSKcVxA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-text-style": "3.27.4" + "@tiptap/extension-text-style": "3.28.0" } }, "node_modules/@tiptap/extension-document": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.27.4.tgz", - "integrity": "sha512-7nAqgfkgb9HADBeCTnOHuTiyZuxfxvMPT3nH4OZeY+cmtkI1On3QffqlmtcUPvNbkhT3o9ehA1hVfCnQ1Ye4LQ==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-document/-/extension-document-3.28.0.tgz", + "integrity": "sha512-5SAKtlB1Tr/eZFhISL86HqmUup6rItvPtuPyRjmZo/VgbMwXEwiyAh1sMgFp5VNaeSMM14vJSyQpjhSaOmaBqg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" } }, "node_modules/@tiptap/extension-dropcursor": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.27.4.tgz", - "integrity": "sha512-RiZasQJuUTUO3aME16Bn8eJH7cYnvhT5JCFDFq0ya/1iFI9wUQA2NJC5tb5TrZ74+sQwkYU9VzexnchM481Y9w==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-dropcursor/-/extension-dropcursor-3.28.0.tgz", + "integrity": "sha512-JA+dXQjjfJBpD0nVsZeddGVXRsmanESM9+8CtM35hI9wJnYMXay/B+5GUhswO20zhT3zhB2ZOTGe9knu6A8nIQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "3.27.4" + "@tiptap/extensions": "3.28.0" } }, "node_modules/@tiptap/extension-gapcursor": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.27.4.tgz", - "integrity": "sha512-svLwSKcFhzpcJeXvxxKkRFuQpykmXrQefVhEsaXq0L95yJIIAGKMRmQC3mxKdzL2j0P9cY7V41bNVSyOAyvclw==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-gapcursor/-/extension-gapcursor-3.28.0.tgz", + "integrity": "sha512-Wo73kM4q8z4Va9i4+0n1cO0UEMVUVBHPqM6cAqEYXjB4T48LQkKjRsiQydCezm185rQAsmm1dyi72gtvVQfdMg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extensions": "3.27.4" + "@tiptap/extensions": "3.28.0" } }, "node_modules/@tiptap/extension-hard-break": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.27.4.tgz", - "integrity": "sha512-W+Z9pmDgqjbdu3NeZOQrzA15iM4w60Yd8l2CYzxcdApPVIfYzb2S3a7+u1RqW9wnTYb6xyZjASmFNfxXS4P4cg==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-hard-break/-/extension-hard-break-3.28.0.tgz", + "integrity": "sha512-JHIFjX1luJgQ4VFEkIeXZpbc54Qiw+69P8FmlazYTh7AIJ6iLCpMFgQFELnivEAZ+/vS0lMPQubg0rCeM3UrHw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" } }, "node_modules/@tiptap/extension-heading": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.27.4.tgz", - "integrity": "sha512-RgvpxzuYk6QEK+az+eiXpWvGlUso42zNcGnjyUrvskoZjS47MbhSg8ylRYQSRtXE0ETlXhAx4J7iGlGr72kyIw==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-heading/-/extension-heading-3.28.0.tgz", + "integrity": "sha512-rKjGG/Ik2lNaXBNVmONEDm5DBfGDLM1NWgSf5RRfBISrH8Lm1xqFruOB9tIaB0YUoSV3SBOiwTF9svmzvKSoRA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" } }, "node_modules/@tiptap/extension-highlight": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-highlight/-/extension-highlight-3.27.4.tgz", - "integrity": "sha512-STRX1qJLhTZslBF8fEE5qpTGrFd/g7Ufidjxt84p0uT8FrtcbfPUwyweeYwhZp7Iw8n+qODGYnheJTOpfaW2JA==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-highlight/-/extension-highlight-3.28.0.tgz", + "integrity": "sha512-T8uvQ1aZs+u496XxycMk5zAIwA0DxN+SCdSAFWCU7bqCAen3ulzOsk6RXJ+Jx40GqTV/ShPyIcEuaJVNurXxbg==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/ueberdosis" + }, + "peerDependencies": { + "@tiptap/core": "3.28.0" + } + }, + "node_modules/@tiptap/extension-horizontal-rule": { + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.28.0.tgz", + "integrity": "sha512-neBCMWprkppQUoLWyeJZDHqBw+xKX2oNhLD9MbFlhKIr092zgfP4mpCvQnSkn1OHl156KzZMp070+NyLBjgQ7A==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0", + "@tiptap/pm": "3.28.0" } }, "node_modules/@tiptap/extension-image": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.27.4.tgz", - "integrity": "sha512-yQ8CazyOL4z1/NbV1NLGv6DvchVhOXHH3uQ7md5VX/IGZruFpnm8IpF9MDpdAUxUFmTsXJDYyO2lWGO1PYWG8A==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-image/-/extension-image-3.28.0.tgz", + "integrity": "sha512-aKGCdEjyujUcQ6tEtq4EPbKxEC16QsKapv3DeZs1c/UHFiEUalbbPHBnxjGnupiLz75IR+07GYqBoZ81kSCxiA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" } }, "node_modules/@tiptap/extension-italic": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.27.4.tgz", - "integrity": "sha512-PeZT4XbyxAp7Lqo/hfA1k5LI27g1RlgS+YgXp2CeHXIrUfSpO5HlZXh02Bvb0pOdl3RFw2tEKtlHzjt8Y1+Nwg==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-italic/-/extension-italic-3.28.0.tgz", + "integrity": "sha512-Yur/ELz6dNVKQC7m8wGjtoLFxamGjJmA0rUEEOacTH6J39aFmcSxYkEGNDkYHbZFyHFYqbej6eI3VE0h08O0mg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" } }, "node_modules/@tiptap/extension-link": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.27.4.tgz", - "integrity": "sha512-6K/FkNwMLWWQbNWKlycrUPTN7YcyVFdFwZncoBXe5WyarRjLTGw7ywafnCI9PDIWSq7ttzVL4NgjN2IN8kBXww==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-link/-/extension-link-3.28.0.tgz", + "integrity": "sha512-hy/PqSeTyl317yseFcHGE+3XVfQKQYaL4uZuj27xlrcO7MZ15drt1h9sUZy1FTBF3mr8676pQu7aoEm/Ww4ZRA==", "license": "MIT", "dependencies": { "linkifyjs": "^4.3.3" @@ -5190,201 +5218,201 @@ "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4", - "@tiptap/pm": "3.27.4" + "@tiptap/core": "3.28.0", + "@tiptap/pm": "3.28.0" } }, "node_modules/@tiptap/extension-list": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.27.4.tgz", - "integrity": "sha512-A0BgmRO1RE0yLCx9w7GQITtKfS9wLE5cdngSYDiSpwulcXJhJjKm5mZ4OUZmks2VN4HO5jMl2BWCGt2NSDhA+w==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.28.0.tgz", + "integrity": "sha512-zQ66i5DuhVOndmZ0d7H475Y5Yb+BMx+zfCjFkCzEc6WVef5MumtxBVTkGLQ0ibxUaD71s4QQZbjHWagpaTg0eQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4", - "@tiptap/pm": "3.27.4" + "@tiptap/core": "3.28.0", + "@tiptap/pm": "3.28.0" } }, "node_modules/@tiptap/extension-list-item": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.27.4.tgz", - "integrity": "sha512-z5TVuPw2mkK0B/x+gFg3uUV7tBdaElDFg0zVgnXZCqlSVTLfIyInOOnG5LTWoAd9BdzBjGrzE3PohDcLVDDGBQ==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list-item/-/extension-list-item-3.28.0.tgz", + "integrity": "sha512-GbXrnMac6knSetZY33NHwOrgXFPqH28uCklQqmOZQlsrdGqezDKk31qoEMr4GsKW9n/lViAeuc07oIzwLwCMng==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.4" + "@tiptap/extension-list": "3.28.0" } }, "node_modules/@tiptap/extension-list-keymap": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.27.4.tgz", - "integrity": "sha512-on7JNDi7Eqz7UdZeZdiO83bQHo0flVDHzjmtR+v/nrCGW9H15D3CHs5+4ozLDiCvTK8tbkBuut/l9AWNxcCE/Q==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-list-keymap/-/extension-list-keymap-3.28.0.tgz", + "integrity": "sha512-u9Wks8c/eQAv0RkULNggOyTKDD69WVbcV9H5cbasPDUbq5XbEFVa9ajxhEGfMmQ5et3EX0QL8qBi50K0GqbIjA==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.4" + "@tiptap/extension-list": "3.28.0" } }, "node_modules/@tiptap/extension-ordered-list": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.27.4.tgz", - "integrity": "sha512-bHwLiof0FqJfWzB0act7oEKMTZatEKQ4IYCvmyF5EktjMs4kxEatkPp4Yx/1LSYSjLy1MMT7oLELyaz2FFYyXA==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-ordered-list/-/extension-ordered-list-3.28.0.tgz", + "integrity": "sha512-OZNYrKKL9D01ySOujlNbKlLS9/3wGgKNYeoHZUg0e+Ta8WPVvL3W1zH6TgiU5sF2ZSGUBoq3w7mdaO/iROlUkw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/extension-list": "3.27.4" + "@tiptap/extension-list": "3.28.0" } }, "node_modules/@tiptap/extension-paragraph": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.27.4.tgz", - "integrity": "sha512-8Dnr1J5s/s4XYYuEF3b784NnCxLjXOlQpmGyXRxTAzW7JaOP08tIUJWVNvSMekfXc2vXa33HUbqjxyyWZEQ6LQ==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-paragraph/-/extension-paragraph-3.28.0.tgz", + "integrity": "sha512-8UMlQIjzqf6r2hSJ/VeJ00RqaOrOB1J5rTk02Vcw2pYeHkOqp+B0ff0HFu4abT9x1q4oXrBAgMsxRtgh/kR14Q==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" } }, "node_modules/@tiptap/extension-strike": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.27.4.tgz", - "integrity": "sha512-8OXwcPKuV3ToBBgyvDxH1jQdObK5FIKCGiyIim6qNWiOpi9BhM3XYD+aO1khjv8qIjtoI/DYbizF4ewj09fX2g==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-strike/-/extension-strike-3.28.0.tgz", + "integrity": "sha512-VVj2ZZU9QYqiHLcjqMqRYvuHSsokj/AgUl+6TzLrKjlWwyZ18D4H2vkyI0g70iVTKnUpZ3sEy8WA/rqjgBjqBg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" } }, "node_modules/@tiptap/extension-subscript": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-3.27.4.tgz", - "integrity": "sha512-gs0AexP7GsE9vgdkwhqYgrKu7kD96PjmgCorsGLdA60m71eTavm6j8NN1m1nvcDPO1sTpP8ACs2mhipj+WS5Iw==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-subscript/-/extension-subscript-3.28.0.tgz", + "integrity": "sha512-lHROuWtzuMv3V4Q11j43Grqci5t0BAMbzIFinPyDSwxDfOCdpj0AwUS+TNNmi4sxZ49QwOXm/vzVMSSi2ChO5g==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4", - "@tiptap/pm": "3.27.4" + "@tiptap/core": "3.28.0", + "@tiptap/pm": "3.28.0" } }, "node_modules/@tiptap/extension-superscript": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-3.27.4.tgz", - "integrity": "sha512-krlpnLeNBF6hVbQDrkuoXiy52v5YctoGPkLnxmftYNtloVrikRpgpetTRsFh0P6hLwv6g/g8SzoM23iMBB3S4A==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-superscript/-/extension-superscript-3.28.0.tgz", + "integrity": "sha512-19MWwQIoREjZsEQ7fa/6DUMx15GKZ+iPkOcSdm/PE2rKiDXhec0acWPZTZgH5dluW9GJOMilk7Xl7U8oBNGfjQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4", - "@tiptap/pm": "3.27.4" + "@tiptap/core": "3.28.0", + "@tiptap/pm": "3.28.0" } }, "node_modules/@tiptap/extension-table": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.27.4.tgz", - "integrity": "sha512-ejQjqt8GjUn4YswG/SsiLr/W3LZApZGUEDW0N7NoOduE0dBZ/pVJHPuqWu33kK+phJjSNCIN+bSAkoWE01rZSw==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.28.0.tgz", + "integrity": "sha512-SX2Uwn/bFyrqjbBo2Hg9wfLT/ofByHm4f80BuG0h5/m89Ve78CgtaK2lGz9jHZRM7rKTG6eqel+PUZQUwcSzOg==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4", - "@tiptap/pm": "3.27.4" + "@tiptap/core": "3.28.0", + "@tiptap/pm": "3.28.0" } }, "node_modules/@tiptap/extension-text": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.27.4.tgz", - "integrity": "sha512-lKQH/hP4FBXsziHypd6Ywj8JFvMLM5GVkK1xsH6yApNuXbHq95rd42ZOYWpYILIBib7tlaz93z61d74UrJiuiw==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-3.28.0.tgz", + "integrity": "sha512-Jqp1LgfY1mnp4TQHoy+vnHyfn6qnnAM6nHgGwbY5zA8b/Xf1Etll6pziTx9p1J1qcfAgSrnjOyAmA++H7VQqww==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" } }, "node_modules/@tiptap/extension-text-align": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.27.4.tgz", - "integrity": "sha512-ArfL7GLOXCSmrmiBiaWwAf7RPHXDdxLGPru29qKDLQDthjXcNOdlwlPBbolRu7mXwlSmaYpqWGrG75/AEat3mw==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-3.28.0.tgz", + "integrity": "sha512-P+KQMTtCpLFq9dRvy/fbyu2BGALulT/1HtsLbpFG4tKATaKa+cFnJ7rLZF7b3AdAMDNtXdnivxAtixAMBt2QWw==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" } }, "node_modules/@tiptap/extension-text-style": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.27.4.tgz", - "integrity": "sha512-Wmj64TQXY85gc7lUNbubW32sDCnVOJlpGraMeARRC9Z0EKBX1JpAxddo/64F17bn3kzLxXVszBFyLRcNgTdU2g==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.28.0.tgz", + "integrity": "sha512-UreMyqZSv770+CXJK/l1qeHUdaNMQAVkxSOPWpiY9FiT8B4OQyjA7WBOlWrzbvVTzfJvXWk2Y3SWgVRx+/Cd9A==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" } }, "node_modules/@tiptap/extension-underline": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.27.4.tgz", - "integrity": "sha512-nRJGvRyEXDtINlHTW+C2oWcL3vmX1URVxAPpkD3Zwn5Rb/vEeOU/pk/w97I0iid816MR4iVbvl1XhbUVegK9gQ==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extension-underline/-/extension-underline-3.28.0.tgz", + "integrity": "sha512-rwxCS6vTh2DJkNIYQX7JSrrRSmm76e2y48aZeuZO5ShkvLWMuJ3/zqDHRxAQVDiJhuE2Cp8NrTmPYlUc9YrT0A==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4" + "@tiptap/core": "3.28.0" } }, "node_modules/@tiptap/extensions": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.27.4.tgz", - "integrity": "sha512-d8opkg2iGtVwJmNGIqv0blfRxnvWOJp1brz+Z8CsP4ojSS2ZtaE46d6JSQ5OeJ7nMpjhT+9wh4UQcA7OSEO59w==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.28.0.tgz", + "integrity": "sha512-DJT1khCK+O/pT1gQlAnoKAx6zwDkgv7GtnhSfkqm1/4KHC3x+SSJnBIgBl9oGHymA+DxWbW1EULU4V3d/kT2uQ==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" }, "peerDependencies": { - "@tiptap/core": "3.27.4", - "@tiptap/pm": "3.27.4" + "@tiptap/core": "3.28.0", + "@tiptap/pm": "3.28.0" } }, "node_modules/@tiptap/pm": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.27.4.tgz", - "integrity": "sha512-UB8lcyomfWk7YGI2PZKNqcYXfyRA+PFj+QntlsUXyrsiA5JJIaE8SHKYjxKlGG/xtW3EtPm1b0p38T9Mk4xiFw==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.28.0.tgz", + "integrity": "sha512-ALcpwZMUdat9gjJKlpscpoqXStoLhU246LPEVBDvJdIsoUKvUu3MrzfXik2Y8mtSGfhjtm9O2TRkWxQiFVMwsQ==", "license": "MIT", "dependencies": { "prosemirror-changeset": "^2.4.1", @@ -5407,69 +5435,41 @@ } }, "node_modules/@tiptap/starter-kit": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.27.4.tgz", - "integrity": "sha512-/sb6rFxNt5BO4hWpUwvHh+Yh1kNyCQuuz3oDpGef5HUUjSdu9p9rfNiHWIUKBadK8VXuw5es7N+UlZ4hma+gvA==", - "license": "MIT", - "dependencies": { - "@tiptap/core": "^3.27.4", - "@tiptap/extension-blockquote": "^3.27.4", - "@tiptap/extension-bold": "^3.27.4", - "@tiptap/extension-bullet-list": "^3.27.4", - "@tiptap/extension-code": "^3.27.4", - "@tiptap/extension-code-block": "^3.27.4", - "@tiptap/extension-document": "^3.27.4", - "@tiptap/extension-dropcursor": "^3.27.4", - "@tiptap/extension-gapcursor": "^3.27.4", - "@tiptap/extension-hard-break": "^3.27.4", - "@tiptap/extension-heading": "^3.27.4", - "@tiptap/extension-horizontal-rule": "^3.27.4", - "@tiptap/extension-italic": "^3.27.4", - "@tiptap/extension-link": "^3.27.4", - "@tiptap/extension-list": "^3.27.4", - "@tiptap/extension-list-item": "^3.27.4", - "@tiptap/extension-list-keymap": "^3.27.4", - "@tiptap/extension-ordered-list": "^3.27.4", - "@tiptap/extension-paragraph": "^3.27.4", - "@tiptap/extension-strike": "^3.27.4", - "@tiptap/extension-text": "^3.27.4", - "@tiptap/extension-underline": "^3.27.4", - "@tiptap/extensions": "^3.27.4", - "@tiptap/pm": "^3.27.4" + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-3.28.0.tgz", + "integrity": "sha512-pqvFpValV+ONtlu3l4s73ROm/tEjoGMmt6uHmSJaLbqTcMHkdWuR3flJ/5brr4IDHe1foxmNicMbRxlje7yBYw==", + "license": "MIT", + "dependencies": { + "@tiptap/core": "^3.28.0", + "@tiptap/extension-blockquote": "^3.28.0", + "@tiptap/extension-bold": "^3.28.0", + "@tiptap/extension-bullet-list": "^3.28.0", + "@tiptap/extension-code": "^3.28.0", + "@tiptap/extension-code-block": "^3.28.0", + "@tiptap/extension-document": "^3.28.0", + "@tiptap/extension-dropcursor": "^3.28.0", + "@tiptap/extension-gapcursor": "^3.28.0", + "@tiptap/extension-hard-break": "^3.28.0", + "@tiptap/extension-heading": "^3.28.0", + "@tiptap/extension-horizontal-rule": "^3.28.0", + "@tiptap/extension-italic": "^3.28.0", + "@tiptap/extension-link": "^3.28.0", + "@tiptap/extension-list": "^3.28.0", + "@tiptap/extension-list-item": "^3.28.0", + "@tiptap/extension-list-keymap": "^3.28.0", + "@tiptap/extension-ordered-list": "^3.28.0", + "@tiptap/extension-paragraph": "^3.28.0", + "@tiptap/extension-strike": "^3.28.0", + "@tiptap/extension-text": "^3.28.0", + "@tiptap/extension-underline": "^3.28.0", + "@tiptap/extensions": "^3.28.0", + "@tiptap/pm": "^3.28.0" }, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" } }, - "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-code-block": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-code-block/-/extension-code-block-3.27.4.tgz", - "integrity": "sha512-a5caWfWN6Z6usy48vzJDDOhWoA6+rFFCHGpQM7jXn/7rRzYPcvBzTZUGptjEbltj4YqtrQ2tVwTJcCtbb+mknA==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "3.27.4", - "@tiptap/pm": "3.27.4" - } - }, - "node_modules/@tiptap/starter-kit/node_modules/@tiptap/extension-horizontal-rule": { - "version": "3.27.4", - "resolved": "https://registry.npmjs.org/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-3.27.4.tgz", - "integrity": "sha512-2eQU/55nE5mhMJHALtLMuBL3dcVJUDVVT7n+uZYMaYE63BtCvC4VS08YLFSR7JZSVJIlgVAmdt5nAw0B+rEPNA==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "peerDependencies": { - "@tiptap/core": "3.27.4", - "@tiptap/pm": "3.27.4" - } - }, "node_modules/@ts-morph/common": { "version": "0.29.0", "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.29.0.tgz", diff --git a/client/package.json b/client/package.json index 15edf4a1d4..3b059d94cf 100644 --- a/client/package.json +++ b/client/package.json @@ -54,21 +54,21 @@ "@ngx-translate/core": "^17.0.0", "@ngx-translate/http-loader": "^17.0.0", "@openslides/motion-diff": "file:../packages/openslides-motion-diff", - "@tiptap/core": "^3.27.4", + "@tiptap/core": "^3.28.0", "@tiptap/extension-blockquote": "^3.27.4", - "@tiptap/extension-color": "^3.27.4", - "@tiptap/extension-highlight": "^3.27.4", - "@tiptap/extension-image": "^3.27.4", + "@tiptap/extension-color": "^3.28.0", + "@tiptap/extension-highlight": "^3.28.0", + "@tiptap/extension-image": "^3.28.0", "@tiptap/extension-link": "^3.23.4", "@tiptap/extension-list": "^3.22.4", - "@tiptap/extension-subscript": "^3.27.4", - "@tiptap/extension-superscript": "^3.27.4", - "@tiptap/extension-table": "^3.27.4", - "@tiptap/extension-text-align": "^3.27.4", + "@tiptap/extension-subscript": "^3.28.0", + "@tiptap/extension-superscript": "^3.28.0", + "@tiptap/extension-table": "^3.28.0", + "@tiptap/extension-text-align": "^3.28.0", "@tiptap/extension-text-style": "^3.4.2", "@tiptap/extensions": "^3.22.4", - "@tiptap/pm": "^3.27.3", - "@tiptap/starter-kit": "^3.27.4", + "@tiptap/pm": "^3.28.0", + "@tiptap/starter-kit": "^3.28.0", "@tsparticles/angular": "^3.0.0", "@tsparticles/engine": "^3.9.1", "@tsparticles/plugin-emitters": "^3.9.1", From 3a9d3ba95f48cc271535896872b8c615e3d2c8ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 13:15:37 +0200 Subject: [PATCH 64/71] Bump cm-chessboard from 8.12.12 to 8.12.14 in /client in the chess group (#6427) --- client/package-lock.json | 8 ++++---- client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index f9f7850068..51f71a20e2 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -53,7 +53,7 @@ "@tsparticles/slim": "^3.9.1", "chart.js": "^4.5.1", "cm-chess": "^3.6.3", - "cm-chessboard": "^8.12.12", + "cm-chessboard": "^8.12.14", "date-fns": "^4.4.0", "exceljs": "^4.4.0", "file-saver": "^2.0.5", @@ -7540,9 +7540,9 @@ } }, "node_modules/cm-chessboard": { - "version": "8.12.12", - "resolved": "https://registry.npmjs.org/cm-chessboard/-/cm-chessboard-8.12.12.tgz", - "integrity": "sha512-AQ68/xn5FpIBTI7ySLQ0S/bKbzPRFZTCgNs8gG8fuxvg3DQ+R3kVUX7hWQUm1KrVyUoPuxTx1BuAqhVJoDtvoQ==", + "version": "8.12.14", + "resolved": "https://registry.npmjs.org/cm-chessboard/-/cm-chessboard-8.12.14.tgz", + "integrity": "sha512-8yMu9IF7s82RkItRofvwgs9zdLyj7uoOgBNYpn26H3Zuo4q6bKm6czvzZvUeRieVlkPph4JrwdA3PG91jdMq8Q==", "license": "MIT" }, "node_modules/cm-pgn": { diff --git a/client/package.json b/client/package.json index 3b059d94cf..8fed8c87cb 100644 --- a/client/package.json +++ b/client/package.json @@ -76,7 +76,7 @@ "@tsparticles/slim": "^3.9.1", "chart.js": "^4.5.1", "cm-chess": "^3.6.3", - "cm-chessboard": "^8.12.12", + "cm-chessboard": "^8.12.14", "date-fns": "^4.4.0", "exceljs": "^4.4.0", "file-saver": "^2.0.5", From 1ac1ba5466056f82071d2e7e7fdaf5e195e5aaad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 13:16:01 +0200 Subject: [PATCH 65/71] Bump prettier from 3.9.5 to 3.9.6 in /client (#6429) --- client/package-lock.json | 8 ++++---- client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 51f71a20e2..c6f9a7105b 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -111,7 +111,7 @@ "karma-coverage": "~2.2.1", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.2.0", - "prettier": "^3.9.5", + "prettier": "^3.9.6", "ts-dedent": "^2.3.0", "ts-morph": "^28.0.0", "ts-node": "^10.9.2", @@ -12577,9 +12577,9 @@ } }, "node_modules/prettier": { - "version": "3.9.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.5.tgz", - "integrity": "sha512-/FVl766LpUfB5vXgCYOYa0MeV/441Ia99AeICQIQFTY/Nw0roZwULcXpku5i1/m5kt/baz+s4Zogspd839HSMg==", + "version": "3.9.6", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz", + "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==", "dev": true, "license": "MIT", "bin": { diff --git a/client/package.json b/client/package.json index 8fed8c87cb..f6f8c828ec 100644 --- a/client/package.json +++ b/client/package.json @@ -134,7 +134,7 @@ "karma-coverage": "~2.2.1", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.2.0", - "prettier": "^3.9.5", + "prettier": "^3.9.6", "ts-dedent": "^2.3.0", "ts-morph": "^28.0.0", "ts-node": "^10.9.2", From e194f9a3f43a95837ce144a4c16a428b8e9e9d3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 14:14:58 +0200 Subject: [PATCH 66/71] Bump @cantoo/pdf-lib from 2.7.2 to 2.7.4 in /client (#6428) --- client/package-lock.json | 8 ++++---- client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index c6f9a7105b..067abcc748 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -21,7 +21,7 @@ "@angular/platform-browser-dynamic": "^22.0.7", "@angular/router": "^22.0.7", "@angular/service-worker": "^22.0.7", - "@cantoo/pdf-lib": "^2.7.2", + "@cantoo/pdf-lib": "^2.7.4", "@coreui/angular-chartjs": "~5.7.4", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", @@ -1790,9 +1790,9 @@ } }, "node_modules/@cantoo/pdf-lib": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/@cantoo/pdf-lib/-/pdf-lib-2.7.2.tgz", - "integrity": "sha512-M+NYHU8nk8/XhaggiF7khx4R1GHxBOCKM0YmbKQZDga8BDxLmOC5b9HUEd9bmlIZQayRzz8kE/797MCSPEMhAA==", + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/@cantoo/pdf-lib/-/pdf-lib-2.7.4.tgz", + "integrity": "sha512-tMet5mSJOESLAvSw/NnVoty2L7hHtWGtXt7CjxL4jeq1r3fg8lB7+sO0qKRyqR3kxeWfa8W5C5IuyNtHSVaTeQ==", "license": "MIT", "dependencies": { "@pdf-lib/standard-fonts": "^1.0.0", diff --git a/client/package.json b/client/package.json index f6f8c828ec..17fc4f8afb 100644 --- a/client/package.json +++ b/client/package.json @@ -44,7 +44,7 @@ "@angular/platform-browser-dynamic": "^22.0.7", "@angular/router": "^22.0.7", "@angular/service-worker": "^22.0.7", - "@cantoo/pdf-lib": "^2.7.2", + "@cantoo/pdf-lib": "^2.7.4", "@coreui/angular-chartjs": "~5.7.4", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", From 4f9d4751cfddf0a64e75adad69ee7e9eb1b3c2ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 15:01:52 +0200 Subject: [PATCH 67/71] Bump eslint-plugin-simple-import-sort from 13.0.0 to 14.0.0 in /client (#6431) --- client/package-lock.json | 8 ++++---- client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 067abcc748..cd2289e3b6 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -100,7 +100,7 @@ "eslint": "^9.39.5", "eslint-config-prettier": "^10.1.8", "eslint-plugin-prettier": "^5.5.6", - "eslint-plugin-simple-import-sort": "^13.0.0", + "eslint-plugin-simple-import-sort": "^14.0.0", "eslint-plugin-unused-imports": "^4.4.1", "fetch-mock": "^12.6.0", "istanbul-lib-instrument": "^6.0.3", @@ -8439,9 +8439,9 @@ } }, "node_modules/eslint-plugin-simple-import-sort": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-13.0.0.tgz", - "integrity": "sha512-McAc+/Nlvcg4byY/CABGH8kqnefWBj8s3JA2okEtz8ixbECQgU46p0HkTUKa4YS7wvgGceimlc34p1nXqbWqtA==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-14.0.0.tgz", + "integrity": "sha512-NUJO0+XFCkk+o5EsAJruTgnfMEpeWrPWeJS15UVF60GgXmqz1BJ9/3hzlvG7lkL8Bubzos5cCLptThbFfPnSMQ==", "dev": true, "license": "MIT", "peerDependencies": { diff --git a/client/package.json b/client/package.json index 17fc4f8afb..ccff31cc25 100644 --- a/client/package.json +++ b/client/package.json @@ -123,7 +123,7 @@ "eslint": "^9.39.5", "eslint-config-prettier": "^10.1.8", "eslint-plugin-prettier": "^5.5.6", - "eslint-plugin-simple-import-sort": "^13.0.0", + "eslint-plugin-simple-import-sort": "^14.0.0", "eslint-plugin-unused-imports": "^4.4.1", "fetch-mock": "^12.6.0", "istanbul-lib-instrument": "^6.0.3", From 0e926c603bd2a15d9d550632c420e7dfc5d57098 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jul 2026 15:02:08 +0200 Subject: [PATCH 68/71] Bump @coreui/angular-chartjs from 5.7.4 to 5.7.6 in /client (#6430) --- client/package-lock.json | 8 ++++---- client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index cd2289e3b6..919ddb72f2 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -22,7 +22,7 @@ "@angular/router": "^22.0.7", "@angular/service-worker": "^22.0.7", "@cantoo/pdf-lib": "^2.7.4", - "@coreui/angular-chartjs": "~5.7.4", + "@coreui/angular-chartjs": "~5.7.6", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", "@intevation/tiptap-extension-office-paste": "^0.1.2", @@ -1815,9 +1815,9 @@ } }, "node_modules/@coreui/angular-chartjs": { - "version": "5.7.4", - "resolved": "https://registry.npmjs.org/@coreui/angular-chartjs/-/angular-chartjs-5.7.4.tgz", - "integrity": "sha512-3IMyzCxNE8gdCHbgf1CJ6eRA1ykbiIAEzWFK1KCslGeDFf07HigCzadsycD8q9Lrfddw+iwW0cuEs9p7ybogTw==", + "version": "5.7.6", + "resolved": "https://registry.npmjs.org/@coreui/angular-chartjs/-/angular-chartjs-5.7.6.tgz", + "integrity": "sha512-Yv+5FNF/w52hH7GQmjM6YDlvlC7VtClMMcjyii5D8sLjeS6tQoQlONgydRNhcU05xq588FxhYG0Bv6ibSj0R1Q==", "license": "MIT", "dependencies": { "lodash-es": "^4.18.1", diff --git a/client/package.json b/client/package.json index ccff31cc25..7ee71cce38 100644 --- a/client/package.json +++ b/client/package.json @@ -45,7 +45,7 @@ "@angular/router": "^22.0.7", "@angular/service-worker": "^22.0.7", "@cantoo/pdf-lib": "^2.7.4", - "@coreui/angular-chartjs": "~5.7.4", + "@coreui/angular-chartjs": "~5.7.6", "@coreui/chartjs": "^4.1.0", "@date-fns/tz": "^1.5.0", "@intevation/tiptap-extension-office-paste": "^0.1.2", From a39dc33e927376cf23f0628b6eee090c9b74ceb8 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Tue, 21 Jul 2026 16:58:41 +0200 Subject: [PATCH 69/71] Fix generate-defaults script (#6432) --- .github/workflows/continuous-integration.yml | 4 + client/cli/generate-models.ts | 31 +---- client/cli/generate-settings-defaults.ts | 118 ++++++++++++++--- client/cli/utils.ts | 32 +++++ .../definitions/meeting-settings-defaults.ts | 125 ++++++++---------- 5 files changed, 197 insertions(+), 113 deletions(-) create mode 100644 client/cli/utils.ts diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index f809b4d75e..0748bee79a 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -126,6 +126,10 @@ jobs: run: npm run generate-models && git diff --exit-code -- src/app/domain/models working-directory: client/ + - name: Check generated defaults are up to date + run: npm run generate-defaults && git diff --exit-code -- src/app/domain/models + working-directory: client/ + - uses: browser-actions/setup-chrome@v2 - name: Build motion diff diff --git a/client/cli/generate-models.ts b/client/cli/generate-models.ts index e604db164f..1d190434e2 100644 --- a/client/cli/generate-models.ts +++ b/client/cli/generate-models.ts @@ -3,8 +3,8 @@ import * as yaml from 'js-yaml'; import * as path from 'path'; import { Project, Scope } from 'ts-morph'; -const SOURCE_META = path.resolve(path.join(__dirname, `../../meta/collection-meta.yml`)); -const SOURCE_COLLECTIONS = path.resolve(path.join(__dirname, `../../meta/collections/`)); +import { getCollectionsYaml, snakeToPascal } from './utils'; + const DESTINATION = path.resolve(path.join(__dirname, `../src/app/domain/models`)); function findModelFile(startPath: string, name: string): string | null { @@ -30,33 +30,6 @@ function findModelFile(startPath: string, name: string): string | null { return null; } -function getCollectionsYaml(): string { - if (!fs.existsSync(SOURCE_COLLECTIONS)) { - console.log(`no dir `, SOURCE_COLLECTIONS); - return null; - } - - let content = fs.readFileSync(SOURCE_META).toString(); - content += `\nmodels:`; - const files = fs.readdirSync(SOURCE_COLLECTIONS); - for (const file of files) { - const filename = path.join(SOURCE_COLLECTIONS, file); - if (filename.endsWith(`.yml`)) { - const collection = fs.readFileSync(filename).toString().replace(/^(.)/gm, ` $1`); - content += `\n ${file.substring(0, file.length - 4)}:\n${collection}`; - } - } - - return content; -} - -function snakeToPascal(input: string): string { - return input - .split(`_`) - .map(substr => substr.charAt(0).toUpperCase() + substr.slice(1)) - .join(``); -} - (async (): Promise => { const models: any = yaml.load(getCollectionsYaml())[`models`]; const project = new Project({}); diff --git a/client/cli/generate-settings-defaults.ts b/client/cli/generate-settings-defaults.ts index a409c1cacc..595e6038b9 100644 --- a/client/cli/generate-settings-defaults.ts +++ b/client/cli/generate-settings-defaults.ts @@ -2,41 +2,125 @@ import * as fs from 'fs'; import * as yaml from 'js-yaml'; import * as path from 'path'; import dedent from 'ts-dedent'; +import { + ArrayLiteralExpression, + CallExpression, + ObjectLiteralExpression, + Project, + PropertyAssignment, + SyntaxKind +} from 'ts-morph'; -import { MeetingSettingsDefinitionService } from '../src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service'; +import { getCollectionsYaml } from './utils'; -const SOURCE = path.resolve(path.join(__dirname, '../meta/models.yml')); +const SETTING_DEFINITIONS = path.resolve( + path.join( + __dirname, + '../src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts' + ) +); const DESTINATION = path.resolve(path.join(__dirname, '../src/app/domain/definitions/meeting-settings-defaults.ts')); const FILE_TEMPLATE = dedent` // THIS FILE IS GENERATED AUTOMATICALLY. DO NOT CHANGE IT MANUALLY. - import { _ } from "@ngx-translate/core"; - import { Settings } from '@app/domain/models/meetings/meeting'; - - export const meetingSettingsDefaults: { [key in keyof Settings]: any } = { + export const meetingSettingsDefaults: Record = { `; -(async () => { - const buffer = fs.readFileSync(SOURCE); - const models: any = yaml.load(buffer.toString()); - const meeting = models['meeting']; +export function isSettingsInput(item: any): any { + return `key` in item; +} + +function getMeetingSettings(): string[] { + const project = new Project(); + const sourceFile = project.addSourceFileAtPath(SETTING_DEFINITIONS); + + const meetingSettingsDecl = sourceFile.getVariableDeclarations().find(decl => decl.getName() === 'meetingSettings'); + + if (!meetingSettingsDecl) { + throw new Error('Variable "meetingSettings" not found.'); + } + + const initializer = meetingSettingsDecl.getInitializer(); + + if (!initializer || initializer.getKind() !== SyntaxKind.CallExpression) { + throw new Error('Initializer is not a function call.'); + } + + const callExpr = initializer as CallExpression; + + const calledFn = callExpr.getExpression(); + if (calledFn.getText() !== 'fillInSettingsDefaults') { + throw new Error(`Expected fillInSettingsDefaults(), got "${calledFn.getText()}".`); + } + + const args = callExpr.getArguments(); + if (args.length === 0) { + throw new Error('fillInSettingsDefaults() was called with no arguments.'); + } + + const arrayArg = args[0]; + + if (arrayArg.getKind() !== SyntaxKind.ArrayLiteralExpression) { + throw new Error(`Expected an array argument, got ${SyntaxKind[arrayArg.getKind()]}.`); + } + + const elements = (arrayArg as ArrayLiteralExpression).getElements(); + + const extractedKeys: string[] = []; + + for (const el of elements) { + if (el.getKind() === SyntaxKind.ObjectLiteralExpression) { + const objectEl = el as ObjectLiteralExpression; + + // Get all descendants with specific property name + const keyProps = objectEl + .getDescendants() + .filter(d => d.getKind() === SyntaxKind.PropertyAssignment) + .map(p => p as PropertyAssignment) + .filter(p => p.getName() === 'key'); + + for (const prop of keyProps) { + const initializer = prop.getInitializer(); + if (!initializer) continue; + + // Check if value is an array literal + if (initializer.getKind() === SyntaxKind.ArrayLiteralExpression) { + const array = initializer as ArrayLiteralExpression; + for (const element of array.getElements()) { + const value = element.getText().replace(/['`]/g, ''); + extractedKeys.push(value); + } + } else { + // Single value + const value = initializer.getText().replace(/['`]/g, ''); + extractedKeys.push(value); + } + } + } + } + + return extractedKeys; +} - const provider = new MeetingSettingsDefinitionService(); +(async (): Promise => { + const models: any = yaml.load(getCollectionsYaml())['models']; + const meeting = models['meeting']['fields']; let content = FILE_TEMPLATE + '\n'; - for (const key of provider.getSettingsKeys()) { - const value = provider.settingsMap[key]; - const defaultValue = meeting[key].default; + for (const key of getMeetingSettings()) { + const defaultValue = meeting[key]?.default; if (defaultValue !== undefined) { - provider.validateDefault(key, defaultValue); - content += ` "${key}": `; + content += ` "${key as string}": `; const defaultString = JSON.stringify(defaultValue); + /* if (value.type === 'string' && !value.dontTranslateDefault) { content += `_(${defaultString}),\n`; - } else { + else { content += `${defaultString},\n`; } + */ + content += `${defaultString},\n`; } } content += '};\n'; diff --git a/client/cli/utils.ts b/client/cli/utils.ts new file mode 100644 index 0000000000..2745e0411c --- /dev/null +++ b/client/cli/utils.ts @@ -0,0 +1,32 @@ +import * as fs from 'fs'; +import * as path from 'path'; + +const SOURCE_META = path.resolve(path.join(__dirname, `../../meta/collection-meta.yml`)); +const SOURCE_COLLECTIONS = path.resolve(path.join(__dirname, `../../meta/collections/`)); + +export function getCollectionsYaml(): string { + if (!fs.existsSync(SOURCE_COLLECTIONS)) { + console.log(`no dir `, SOURCE_COLLECTIONS); + return null; + } + + let content = fs.readFileSync(SOURCE_META).toString(); + content += `\nmodels:`; + const files = fs.readdirSync(SOURCE_COLLECTIONS); + for (const file of files) { + const filename = path.join(SOURCE_COLLECTIONS, file); + if (filename.endsWith(`.yml`)) { + const collection = fs.readFileSync(filename).toString().replace(/^(.)/gm, ` $1`); + content += `\n ${file.substring(0, file.length - 4)}:\n${collection}`; + } + } + + return content; +} + +export function snakeToPascal(input: string): string { + return input + .split(`_`) + .map(substr => substr.charAt(0).toUpperCase() + substr.slice(1)) + .join(``); +} diff --git a/client/src/app/domain/definitions/meeting-settings-defaults.ts b/client/src/app/domain/definitions/meeting-settings-defaults.ts index 8eaa8ac779..3dd6d913cf 100644 --- a/client/src/app/domain/definitions/meeting-settings-defaults.ts +++ b/client/src/app/domain/definitions/meeting-settings-defaults.ts @@ -1,95 +1,70 @@ // THIS FILE IS GENERATED AUTOMATICALLY. DO NOT CHANGE IT MANUALLY. -import { _ } from '@ngx-translate/core'; - export const meetingSettingsDefaults: Record = { - name: `Meeting title`, + name: 'OpenSlides', enable_anonymous: false, - export_csv_separator: `;`, - export_csv_encoding: `utf-8`, - export_pdf_pagenumber_alignment: `center`, - export_pdf_fontsize: 10, - export_pdf_pagesize: `A4`, - export_pdf_line_height: 1.25, - export_pdf_page_margin_left: 20, - export_pdf_page_margin_top: 25, - export_pdf_page_margin_right: 20, - export_pdf_page_margin_bottom: 20, + users_pdf_wlan_encryption: 'WPA', agenda_enable_numbering: true, - agenda_numeral_system: `arabic`, - agenda_item_creation: `default_no`, - agenda_new_items_default_visibility: `internal`, - agenda_show_internal_items_on_projector: false, - agenda_show_topic_navigation_on_detail_view: false, + agenda_numeral_system: 'arabic', + agenda_item_creation: 'default_no', + agenda_new_items_default_visibility: 'internal', agenda_show_subtitles: false, - list_of_speakers_enable_point_of_order_speakers: true, - list_of_speakers_enable_pro_contra_speech: false, - list_of_speakers_can_set_contribution_self: false, - list_of_speakers_present_users_only: false, - list_of_speakers_speaker_note_for_everyone: true, + agenda_show_topic_navigation_on_detail_view: false, + agenda_show_internal_items_on_projector: false, list_of_speakers_initially_closed: false, + list_of_speakers_present_users_only: false, + list_of_speakers_allow_multiple_speakers: false, list_of_speakers_show_first_contribution: false, list_of_speakers_hide_contribution_count: false, - list_of_speakers_couple_countdown: true, + list_of_speakers_enable_pro_contra_speech: false, + list_of_speakers_can_set_contribution_self: false, list_of_speakers_show_amount_of_speakers_on_slide: true, - list_of_speakers_amount_last_on_projector: 0, list_of_speakers_amount_next_on_projector: -1, + list_of_speakers_amount_last_on_projector: 0, + list_of_speakers_couple_countdown: true, projector_countdown_warning_time: 0, projector_countdown_default_time: 60, - motions_preamble: _(`The assembly may decide:`), - motions_default_line_numbering: `outside`, - motions_line_length: 85, + list_of_speakers_enable_point_of_order_speakers: true, + list_of_speakers_speaker_note_for_everyone: true, + list_of_speakers_can_create_point_of_order_for_others: false, + list_of_speakers_closing_disables_point_of_order: false, + list_of_speakers_enable_point_of_order_categories: false, + motions_preamble: 'The assembly may decide:', motions_reason_required: false, + motions_default_line_numbering: 'outside', + motions_line_length: 85, + motions_recommendation_text_mode: 'diff', + motions_show_referring_motions: true, + motions_show_sequential_number: true, + motions_enable_restricted_editor_for_non_manager: true, motions_enable_text_on_projector: true, motions_enable_reason_on_projector: false, motions_enable_recommendation_on_projector: true, - motions_show_referring_motions: true, - motions_hide_metadata_background: false, motions_enable_sidebox_on_projector: false, - motions_show_sequential_number: true, - motions_recommendation_text_mode: `diff`, - motions_default_sorting: `number`, - motions_number_type: `per_category`, - motions_number_min_digits: 2, + motions_hide_metadata_background: false, motions_number_with_blank: false, + motions_number_min_digits: 2, + motions_number_type: 'per_category', + motions_default_sorting: 'number', motions_amendments_enabled: true, motions_amendments_in_main_list: true, - motions_amendments_prefix: _(`-Ä`), - motions_amendments_text_mode: `paragraph`, motions_amendments_multiple_paragraphs: true, motions_amendments_of_amendments: false, + motions_amendments_prefix: '-Ä', + motions_amendments_text_mode: 'paragraph', motions_supporters_min_amount: 0, - motions_block_slide_columns: 3, - motion_poll_default_type: `pseudoanonymous`, - motion_poll_default_method: `YNA`, - motion_poll_default_onehundred_percent_base: `YNA`, - motion_poll_ballot_paper_selection: `CUSTOM_NUMBER`, - motion_poll_ballot_paper_number: 8, - motion_poll_default_backend: `fast`, - motions_export_title: _(`Motions`), - motions_export_submitter_recommendation: true, - motions_export_follow_recommendation: false, - assignment_poll_default_method: `Y`, - assignment_poll_default_type: `pseudoanonymous`, - assignment_poll_default_onehundred_percent_base: `valid`, - assignment_poll_sort_poll_result_by_votes: true, + poll_default_live_voting_enabled: false, + motions_enable_origin_motion_display: false, + motions_origin_motion_toggle_default: false, + assignment_poll_default_method: 'selection', assignment_poll_add_candidates_to_list_of_speakers: false, - assignment_poll_enable_max_votes_per_option: false, - assignment_poll_default_backend: `fast`, - assignment_poll_ballot_paper_selection: `CUSTOM_NUMBER`, - assignment_poll_ballot_paper_number: 8, - assignments_export_title: _(`Elections`), - users_enable_presence_view: false, users_allow_self_set_present: true, + users_enable_presence_view: false, users_enable_vote_weight: false, - users_enable_vote_delegations: false, - users_pdf_welcometitle: _(`Welcome to OpenSlides`), - users_pdf_welcometext: _(`[Place for your welcome and help text.]`), - users_pdf_wlan_encryption: `WPA`, - users_pdf_url: `https://example.com`, - users_email_sender: `OpenSlides`, - users_email_subject: _(`OpenSlides access data`), - users_email_body: `Dear {name},\n\nthis is your personal OpenSlides login:\n\n{url}\nUsername: {username}\nPassword: {password}\n\n\nThis email was generated automatically.`, + users_email_sender: 'OpenSlides', + users_email_subject: 'OpenSlides access data', + users_email_body: + 'Dear {name},\n\nthis is your personal OpenSlides login:\n\n{url}\nUsername: {username}\nPassword: {password}\n\n\nThis email was generated automatically.', conference_show: false, conference_los_restriction: true, conference_auto_connect: false, @@ -99,8 +74,24 @@ export const meetingSettingsDefaults: Record = { conference_enable_helpdesk: false, applause_enable: false, applause_show_level: false, - applause_type: `applause-type-bar`, + applause_type: 'applause-type-bar', applause_min_amount: 1, applause_max_amount: 0, - applause_timeout: 5 + applause_timeout: 5, + export_csv_separator: ';', + export_csv_encoding: 'utf-8', + export_pdf_pagenumber_alignment: 'center', + export_pdf_fontsize: 10, + export_pdf_line_height: 1.25, + export_pdf_page_margin_left: 20, + export_pdf_page_margin_right: 20, + export_pdf_page_margin_top: 25, + export_pdf_page_margin_bottom: 20, + export_pdf_pagesize: 'A4', + motions_export_title: 'Motions', + motions_export_submitter_recommendation: true, + motions_export_follow_recommendation: false, + assignments_export_title: 'Elections', + users_pdf_welcometitle: 'Welcome to OpenSlides', + users_pdf_welcometext: '[Place for your welcome and help text.]' }; From 12999a80b6050f51a3968b01c8362ee42bb06328 Mon Sep 17 00:00:00 2001 From: Bastian Rihm Date: Tue, 21 Jul 2026 17:33:35 +0200 Subject: [PATCH 70/71] Fix types in test files not recognized (#6415) --- client/tsconfig.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/client/tsconfig.json b/client/tsconfig.json index cc8ac88906..1ecfb0e660 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -30,5 +30,16 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } + }, + "references": [ + { + "path": "./tsconfig.app.json" + }, + { + "path": "./tsconfig.spec.json" + }, + { + "path": "./tsconfig.worker.json" + } + ] } From edd45d5fb4e9a65013d2cb2c4a45a86756b20eee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jul 2026 09:20:28 +0200 Subject: [PATCH 71/71] Bump fast-uri from 3.1.2 to 3.1.4 in /client (#6434) --- client/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 919ddb72f2..484899d106 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -9009,9 +9009,9 @@ } }, "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.4.tgz", + "integrity": "sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==", "dev": true, "funding": [ {