ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5898 from GabrielInTheWorld/cleanup-fix-spinner

Browse Source 
Some cleanup in favor of spinner-fixes
This commit is contained in:
GabrielInTheWorld 2021-03-01 16:49:02 +01:00 committed by GitHub
commit a450a1dff5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 70 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
client/src/app/app.component.spec.ts
View File

@ -1,33 +0,0 @@
// import { async, fakeAsync, TestBed, tick } from '@angular/core/testing';
// import { TranslateService } from '@ngx-translate/core';
// import { AppComponent } from './app.component';
// import { E2EImportsModule } from './../e2e-imports.module';
// import { ServertimeService } from './core/core-services/servertime.service';
describe('AppComponent', () => {
// let servertimeService, translate;
// beforeEach(async(() => {
// TestBed.configureTestingModule({
// imports: [E2EImportsModule]
// }).compileComponents();
// servertimeService = TestBed.inject(ServertimeService);
// translate = TestBed.inject(TranslateService);
// spyOn(servertimeService, 'startScheduler').and.stub();
// spyOn(translate, 'addLangs').and.stub();
// spyOn(translate, 'setDefaultLang').and.stub();
// spyOn(translate, 'getBrowserLang').and.stub();
// spyOn(translate, 'getLangs').and.returnValue([]);
// spyOn(translate, 'use').and.stub();
// }));
// it('should create the app', fakeAsync(() => {
// const fixture = TestBed.createComponent(AppComponent);
// const app = fixture.debugElement.componentInstance;
// expect(app).toBeTruthy();
// tick(1000);
// fixture.whenStable().then(() => {
// expect(servertimeService.startScheduler).toHaveBeenCalled();
// });
// }));
});

7
client/src/app/app.component.ts
View File

@ -14,12 +14,12 @@ import { DataStoreUpgradeService } from './core/core-services/data-store-upgrade
import { LoadFontService } from './core/ui-services/load-font.service';
import { LoginDataService } from './core/ui-services/login-data.service';
import { OfflineService } from './core/core-services/offline.service';
import { OpenSlidesStatusService } from './core/core-services/openslides-status.service';
import { OpenSlidesService } from './core/core-services/openslides.service';
import { OperatorService } from './core/core-services/operator.service';
import { OverlayService } from './core/ui-services/overlay.service';
import { RoutingStateService } from './core/ui-services/routing-state.service';
import { ServertimeService } from './core/core-services/servertime.service';
import { StableService } from './core/core-services/stable.service';
import { ThemeService } from './core/ui-services/theme.service';
import { VotingBannerService } from './core/ui-services/voting-banner.service';
@ -73,7 +73,7 @@ export class AppComponent {
appRef: ApplicationRef,
servertimeService: ServertimeService,
openslidesService: OpenSlidesService,
stableService: StableService,
openslidesStatus: OpenSlidesStatusService,
router: Router,
offlineService: OfflineService,
operator: OperatorService,
@ -113,8 +113,7 @@ export class AppComponent {
tap(() => console.debug('App is now stable!'))
)
.subscribe(() => {
openslidesService.setStable();
stableService.setStable();
openslidesStatus.setStable();
servertimeService.startScheduler();
});
}

6
client/src/app/core/core-services/http-interceptors/index.ts
View File

@ -1,5 +1,7 @@
import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { NoopInterceptorService } from './noop-interceptor.service';
import { StableInterceptorService } from './stable-interceptor.service';
export const httpInterceptorProviders = [{ provide: HTTP_INTERCEPTORS, useClass: NoopInterceptorService, multi: true }];
export const httpInterceptorProviders = [
{ provide: HTTP_INTERCEPTORS, useClass: StableInterceptorService, multi: true }
];

14
client/src/app/core/core-services/http-interceptors/noop-interceptor.service.spec.ts
View File

@ -1,14 +0,0 @@
// import { TestBed } from '@angular/core/testing';
// import { NoopInterceptorService } from './noop-interceptor.service';
describe('NoopInterceptorService', () => {
// let service: NoopInterceptorService;
// beforeEach(() => {
// TestBed.configureTestingModule({});
// service = TestBed.inject(NoopInterceptorService);
// });
// it('should be created', () => {
// expect(service).toBeTruthy();
// });
});

22
client/src/app/core/core-services/http-interceptors/noop-interceptor.service.ts
View File

@ -1,22 +0,0 @@
import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable, Subject } from 'rxjs';
import { first, mergeMap } from 'rxjs/operators';
import { StableService } from '../stable.service';
@Injectable({
providedIn: 'root'
})
export class NoopInterceptorService implements HttpInterceptor {
public constructor(private openslidesService: StableService) {}
public intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
return this.openslidesService.booted.pipe(
first(stable => stable),
mergeMap(() => {
return next.handle(req);
})
);
}
}

36
client/src/app/core/core-services/http-interceptors/stable-interceptor.service.ts Normal file
View File

@ -0,0 +1,36 @@
import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs';
import { first, mergeMap } from 'rxjs/operators';
import { OpenSlidesStatusService } from '../openslides-status.service';
/**
* An http interceptor to make sure, that every request is made
* only when this application is stable.
*/
@Injectable({
providedIn: 'root'
})
export class StableInterceptorService implements HttpInterceptor {
private readonly stableSubject = new BehaviorSubject<boolean>(false);
public constructor(private openslidesStatus: OpenSlidesStatusService) {
this.update();
}
public intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
return this.stableSubject.pipe(
first(stable => stable),
mergeMap(() => {
return next.handle(req);
})
);
}
private async update(): Promise<void> {
await this.openslidesStatus.stable;
this.stableSubject.next(true);
}
}

15
client/src/app/core/core-services/openslides-status.service.ts
View File

@ -1,7 +1,10 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject } from 'rxjs';
import { History } from 'app/shared/models/core/history';
import { BannerDefinition, BannerService } from '../ui-services/banner.service';
import { Deferred } from '../promises/deferred';
/**
* Holds information about OpenSlides. This is not included into other services to
@ -26,13 +29,25 @@ export class OpenSlidesStatusService {
return !!this.history;
}
public get stable(): Promise<void> {
return this._stable;
}
public isPrioritizedClient = false;
private _stable = new Deferred();
private _bootedSubject = new BehaviorSubject<boolean>(false);
/**
* Ctor, does nothing.
*/
public constructor(private banner: BannerService) {}
public setStable(): void {
this._stable.resolve();
this._bootedSubject.next(true);
}
/**
* Calls the getLocaleString function of the history object, if present.
*

15
client/src/app/core/core-services/openslides.service.ts
View File

@ -5,8 +5,8 @@ import { BehaviorSubject } from 'rxjs';
import { CommunicationManagerService } from './communication-manager.service';
import { DataStoreService } from './data-store.service';
import { Deferred } from '../promises/deferred';
import { OfflineBroadcastService, OfflineReason } from './offline-broadcast.service';
import { OpenSlidesStatusService } from './openslides-status.service';
import { OperatorService, WhoAmI } from './operator.service';
import { StorageService } from './storage.service';
@ -35,15 +35,10 @@ export class OpenSlidesService {
return this.booted.value;
}
public get isStable(): Promise<void> {
return this.stable;
}
private stable = new Deferred();
public constructor(
private storageService: StorageService,
private operator: OperatorService,
private openslidesStatus: OpenSlidesStatusService,
private router: Router,
private DS: DataStoreService,
private communicationManager: CommunicationManagerService,
@ -52,10 +47,6 @@ export class OpenSlidesService {
this.bootup();
}
public setStable(): void {
this.stable.resolve();
}
/**
* the bootup-sequence: Do a whoami request and if it was successful, do
* {@method afterLoginBootup}. If not, redirect the user to the login page.
@ -129,7 +120,7 @@ export class OpenSlidesService {
*/
private async setupDataStoreAndStartCommunication(): Promise<void> {
await this.DS.initFromStorage();
await this.stable;
await this.openslidesStatus.stable;
this.communicationManager.startCommunication();
}

16
client/src/app/core/core-services/stable.service.spec.ts
View File

@ -1,16 +0,0 @@
import { TestBed } from '@angular/core/testing';
import { StableService } from './stable.service';
describe('StableService', () => {
let service: StableService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(StableService);
});
it('should be created', () => {
expect(service).toBeTruthy();
});
});

29
client/src/app/core/core-services/stable.service.ts
View File

@ -1,29 +0,0 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs';
import { Deferred } from '../promises/deferred';
@Injectable({
providedIn: 'root'
})
export class StableService {
public get isStable(): Promise<void> {
return this.stable;
}
public get booted(): Observable<boolean> {
return this.bootSubject.asObservable();
}
private stable = new Deferred();
private bootSubject = new BehaviorSubject<boolean>(false);
public constructor() {}
public setStable(): void {
this.stable.resolve();
this.bootSubject.next(true);
}
}

17
client/src/app/site/projector/components/projector-detail/projector-detail.component.ts
View File

@ -8,9 +8,9 @@ import { ActivatedRoute } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
import { timer } from 'rxjs';
import { OpenSlidesStatusService } from 'app/core/core-services/openslides-status.service';
import { OperatorService, Permission } from 'app/core/core-services/operator.service';
import { ProjectorService } from 'app/core/core-services/projector.service';
import { StableService } from 'app/core/core-services/stable.service';
import { CountdownRepositoryService } from 'app/core/repositories/projector/countdown-repository.service';
import { ProjectorMessageRepositoryService } from 'app/core/repositories/projector/projector-message-repository.service';
import {
@ -98,7 +98,7 @@ export class ProjectorDetailComponent extends BaseViewComponentDirective impleme
private cd: ChangeDetectorRef,
private promptService: PromptService,
private opertator: OperatorService,
private stableService: StableService
private openslidesStatus: OpenSlidesStatusService
) {
super(titleService, translate, matSnackBar);
}
@ -119,8 +119,10 @@ export class ProjectorDetailComponent extends BaseViewComponentDirective impleme
})
);
});
this.countdownRepo.getViewModelListObservable().subscribe(countdowns => (this.countdowns = countdowns));
this.messageRepo.getViewModelListObservable().subscribe(messages => (this.messages = messages));
this.repo.getViewModelListObservable().subscribe(projectors => (this.projectorCount = projectors.length));
this.installUpdater();
this.loadSubscriptions();
}
public editProjector(): void {
@ -351,15 +353,8 @@ export class ProjectorDetailComponent extends BaseViewComponentDirective impleme
}
}
private async loadSubscriptions(): Promise<void> {
await this.stableService.isStable;
this.countdownRepo.getViewModelListObservable().subscribe(countdowns => (this.countdowns = countdowns));
this.messageRepo.getViewModelListObservable().subscribe(messages => (this.messages = messages));
this.repo.getViewModelListObservable().subscribe(projectors => (this.projectorCount = projectors.length));
}
private async installUpdater(): Promise<void> {
await this.stableService.isStable;
await this.openslidesStatus.stable;
this.subscriptions.push(timer(0, 500).subscribe(() => this.cd.detectChanges()));
}
}

6
client/src/app/site/projector/components/projector-list/projector-list.component.ts
View File

@ -16,7 +16,7 @@ import { Title } from '@angular/platform-browser';
import { TranslateService } from '@ngx-translate/core';
import { BehaviorSubject, timer } from 'rxjs';
import { OpenSlidesService } from 'app/core/core-services/openslides.service';
import { OpenSlidesStatusService } from 'app/core/core-services/openslides-status.service';
import { OperatorService, Permission } from 'app/core/core-services/operator.service';
import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service';
import { Projector } from 'app/shared/models/core/projector';
@ -78,7 +78,7 @@ export class ProjectorListComponent extends BaseViewComponentDirective implement
private repo: ProjectorRepositoryService,
private formBuilder: FormBuilder,
private operator: OperatorService,
private openslidesService: OpenSlidesService,
private openslidesStatus: OpenSlidesStatusService,
private dialogService: MatDialog,
private cd: ChangeDetectorRef
) {
@ -135,7 +135,7 @@ export class ProjectorListComponent extends BaseViewComponentDirective implement
}
private async installUpdater(): Promise<void> {
await this.openslidesService.isStable;
await this.openslidesStatus.stable;
/**
* Angulars change detection goes nuts, since countdown and motios with long texts are pushing too much data
*/