Skip to content
Snippets Groups Projects
Commit c510855d authored by jojohoch's avatar jojohoch
Browse files

[player] Remove verification of unit definition version on start

- Verification is task of the common sanitizer
- Remove unnecessary AlertDialog
parent 250c5642
No related branches found
No related tags found
No related merge requests found
import { Component, OnInit } from '@angular/core';
import { registerLocaleData } from '@angular/common';
import localeDe from '@angular/common/locales/de';
import { MatDialog } from '@angular/material/dialog';
import { TranslateService } from '@ngx-translate/core';
import { PlayerConfig, VopStartCommand } from './models/verona';
import { UnitStateElementMapperService } from './services/unit-state-element-mapper.service';
......@@ -11,7 +10,6 @@ import { NativeEventService } from './services/native-event.service';
import { MetaDataService } from './services/meta-data.service';
import { UnitStateService } from './services/unit-state.service';
import { MediaPlayerService } from './services/media-player.service';
import { AlertDialogComponent } from './components/alert-dialog/alert-dialog.component';
import { Page, Unit } from '../../../common/interfaces/unit';
import { UnitDefinitionSanitizer } from '../../../common/util/unit-definition-sanitizer';
import { ValidatorService } from './services/validator.service';
......@@ -38,8 +36,7 @@ export class AppComponent implements OnInit {
private unitStateService: UnitStateService,
private mediaPlayerService: MediaPlayerService,
private unitStateElementMapperService: UnitStateElementMapperService,
private validatorService: ValidatorService,
private dialog: MatDialog) {
private validatorService: ValidatorService) {
}
ngOnInit(): void {
......@@ -65,24 +62,14 @@ export class AppComponent implements OnInit {
if (message.unitDefinition) {
const unitDefinition: Unit = UnitDefinitionSanitizer.sanitize(JSON.parse(message.unitDefinition));
this.unitStateElementMapperService.registerDropListValueIds(unitDefinition);
if (this.metaDataService.verifyUnitDefinitionVersion(unitDefinition.unitDefinitionType)) {
this.playerConfig = message.playerConfig || {};
this.veronaPostService.sessionId = message.sessionId;
this.veronaPostService.stateReportPolicy = message.playerConfig?.stateReportPolicy || 'none';
this.pages = unitDefinition.pages;
this.unitStateService.unitStateElementCodes = message.unitState?.dataParts?.elementCodes ?
JSON.parse(message.unitState.dataParts.elementCodes) : [];
// eslint-disable-next-line no-console
console.log('player: unitStateElementCodes', this.unitStateService.unitStateElementCodes);
} else {
this.dialog.open(AlertDialogComponent, {
data: {
title: this.translateService.instant('dialogTitle.wrongUnitDefinitionType'),
content: this.translateService.instant('dialogContent.wrongUnitDefinitionType',
{ version: this.metaDataService.playerMetadata.supportedUnitDefinitionTypes })
}
});
}
this.playerConfig = message.playerConfig || {};
this.veronaPostService.sessionId = message.sessionId;
this.veronaPostService.stateReportPolicy = message.playerConfig?.stateReportPolicy || 'none';
this.pages = unitDefinition.pages;
this.unitStateService.unitStateElementCodes = message.unitState?.dataParts?.elementCodes ?
JSON.parse(message.unitState.dataParts.elementCodes) : [];
// eslint-disable-next-line no-console
console.log('player: unitStateElementCodes', this.unitStateService.unitStateElementCodes);
} else {
// eslint-disable-next-line no-console
console.warn('player: message has no unitDefinition');
......
......@@ -14,7 +14,6 @@ import { PlayerTranslateLoader } from './classes/player-translate-loader';
import { LayoutComponent } from './components/layout/layout.component';
import { HideFirstChildDirective } from './directives/hide-first-child.directive';
import { ScrollIndexDirective } from './directives/scroll-index.directive';
import { AlertDialogComponent } from './components/alert-dialog/alert-dialog.component';
import { IntersectionDetectionDirective } from './directives/intersection-detection.directive';
import { KeyboardComponent } from './components/keyboard/keyboard.component';
import { KeyComponent } from './components/key/key.component';
......@@ -46,7 +45,6 @@ import { UnitStateComponent } from './components/unit-state/unit-state.component
SectionComponent,
PlayerStateComponent,
LayoutComponent,
AlertDialogComponent,
HideFirstChildDirective,
ScrollIndexDirective,
IntersectionDetectionDirective,
......
<h2 mat-dialog-title>{{data.title}}</h2>
<mat-dialog-content class="mat-typography">
<p>{{data.content}}</p>
</mat-dialog-content>
<mat-dialog-actions>
<button mat-button mat-dialog-close>{{'close' | translate}}</button>
</mat-dialog-actions>
import { Component, Inject } from '@angular/core';
import { MAT_DIALOG_DATA } from '@angular/material/dialog';
@Component({
selector: 'aspect-alert-dialog',
templateUrl: './alert-dialog.component.html',
styleUrls: ['./alert-dialog.component.css']
})
export class AlertDialogComponent {
constructor(@Inject(MAT_DIALOG_DATA) public data: { title: string, content: string }) { }
}
......@@ -13,16 +13,4 @@ export class MetaDataService {
this.playerMetadata = JSON.parse(playerMetadata);
}
}
// eslint-disable-next-line class-methods-use-this
verifyUnitDefinitionVersion(unitDefinition: string | undefined): boolean {
return true;
// return (!!unitDefinition && unitDefinition === this.playerMetadata.supportedUnitDefinitionTypes);
}
// eslint-disable-next-line class-methods-use-this
verifyUnitStateDataType(unitStateDataType: string | undefined): boolean {
return true;
// return (!!unitStateDataType && unitStateDataType === this.playerMetadata.supportedUnitStateDataTypes);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment