Skip to content

Commit 1607503

Browse files
committed
Merge branch 'main' into 5949-add-timezone-fields
2 parents 2339f4f + 9619c0b commit 1607503

File tree

5 files changed

+28
-3
lines changed

5 files changed

+28
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { BaseUiComponent } from 'src/app/ui/base/base-ui-component';
2020
import { ChessDialogComponent } from 'src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/components/chess-dialog/chess-dialog.component';
2121
import { ChessChallengeService } from 'src/app/ui/modules/sidenav/modules/easter-egg/modules/chess-dialog/services/chess-challenge.service';
2222

23-
import { AccountDialogComponent } from '../account-dialog/account-dialog.component';
23+
import { AccountDialogMainComponent } from '../account-dialog-main/account-dialog-main.component';
2424

2525
@Component({
2626
selector: `os-account-button`,
@@ -137,7 +137,7 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
137137
}
138138

139139
public openAccountDialog(): void {
140-
this.dialog.open(AccountDialogComponent, {
140+
this.dialog.open(AccountDialogMainComponent, {
141141
...largeDialogSettings,
142142
height: `530px`
143143
});
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<os-account-dialog></os-account-dialog>

client/src/app/site/modules/global-headbar/components/account-dialog-main/account-dialog-main.component.scss

Whitespace-only changes.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { Component } from '@angular/core';
2+
import { Id } from 'src/app/domain/definitions/key-types';
3+
import { SubscriptionConfig } from 'src/app/domain/interfaces/subscription-config';
4+
import { BaseMeetingModelRequestHandler } from 'src/app/site/pages/meetings/base/base-meeting-model-request-handler.component';
5+
import { getDashboardMeetingListSubscriptionConfig } from 'src/app/site/pages/organization/pages/dashboard/dashboard.subscription';
6+
7+
@Component({
8+
selector: `os-account-dialog-main`,
9+
templateUrl: `./account-dialog-main.component.html`,
10+
styleUrls: [`./account-dialog-main.component.scss`],
11+
standalone: false
12+
})
13+
export class AccountDialogMainComponent extends BaseMeetingModelRequestHandler {
14+
protected getSubscriptions(_id: Id): SubscriptionConfig<any>[] {
15+
return [getDashboardMeetingListSubscriptionConfig()];
16+
}
17+
}

client/src/app/site/modules/global-headbar/global-headbar.module.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { OpenSlidesTranslationModule } from '../translations';
2525
import { UserComponentsModule } from '../user-components';
2626
import { AccountButtonComponent } from './components/account-button/account-button.component';
2727
import { AccountDialogComponent } from './components/account-dialog/account-dialog.component';
28+
import { AccountDialogMainComponent } from './components/account-dialog-main/account-dialog-main.component';
2829
import { GlobalHeadbarComponent } from './components/global-headbar/global-headbar.component';
2930
import { GlobalSearchComponent } from './components/global-search/global-search.component';
3031

@@ -49,7 +50,13 @@ const DECLARATIONS = [GlobalHeadbarComponent];
4950

5051
@NgModule({
5152
exports: DECLARATIONS,
52-
declarations: [...DECLARATIONS, AccountButtonComponent, AccountDialogComponent, GlobalSearchComponent],
53+
declarations: [
54+
...DECLARATIONS,
55+
AccountButtonComponent,
56+
AccountDialogComponent,
57+
AccountDialogMainComponent,
58+
GlobalSearchComponent
59+
],
5360
imports: [
5461
CommonModule,
5562
CommaSeparatedListingComponent,

0 commit comments

Comments
 (0)