Skip to content

Commit f852096

Browse files
committed
fix linter and test errors
1 parent 3862442 commit f852096

File tree

4 files changed

+43
-26
lines changed

4 files changed

+43
-26
lines changed

src/app/item-page/clarin-files-section/clarin-files-section.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('ClarinFilesSectionComponent', () => {
2323
let halService: HALEndpointService;
2424
// Set up the mock service's getMetadataBitstream method to return a simple stream
2525
const metadatabitstream = new MetadataBitstream();
26-
metadatabitstream.id = 123;
26+
metadatabitstream.id = '70ccc608-f6a5-4c96-ab2d-53bc56ae8ebe';
2727
metadatabitstream.name = 'test';
2828
metadatabitstream.description = 'test';
2929
metadatabitstream.fileSize = 1024;

src/app/item-page/simple/field-components/preview-section/file-description/file-description.component.spec.ts

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,20 @@ import { RouterTestingModule } from '@angular/router/testing';
1212
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
1313
import { HALEndpointService } from '../../../../../core/shared/hal-endpoint.service';
1414
import { FileSizePipe } from '../../../../../shared/utils/file-size-pipe';
15+
import {BitstreamDataService} from '../../../../../core/data/bitstream-data.service';
16+
import {AuthService} from '../../../../../core/auth/auth.service';
17+
import {AuthorizationDataService} from '../../../../../core/data/feature-authorization/authorization-data.service';
18+
import {FileService} from '../../../../../core/shared/file.service';
19+
import {AuthServiceStub} from '../../../../../shared/testing/auth-service.stub';
20+
import {FileServiceStub} from '../../../../../shared/testing/file-service.stub';
21+
import {AuthorizationDataServiceStub} from '../../../../../shared/testing/authorization-service.stub';
22+
import {Bitstream} from '../../../../../core/shared/bitstream.model';
1523

1624
describe('FileDescriptionComponent', () => {
1725
let component: FileDescriptionComponent;
1826
let fixture: ComponentFixture<FileDescriptionComponent>;
1927
let halService: HALEndpointService;
28+
let bitstreamDataService: BitstreamDataService;
2029

2130
beforeEach(async () => {
2231
const configurationDataService = jasmine.createSpyObj('configurationDataService', {
@@ -32,6 +41,10 @@ describe('FileDescriptionComponent', () => {
3241
getRootHref: 'root url',
3342
});
3443

44+
bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
45+
findById: createSuccessfulRemoteDataObject$(new Bitstream()),
46+
});
47+
3548
await TestBed.configureTestingModule({
3649
imports: [TranslateModule.forRoot({
3750
loader: {
@@ -42,7 +55,11 @@ describe('FileDescriptionComponent', () => {
4255
declarations: [FileDescriptionComponent, FileSizePipe],
4356
providers: [
4457
{ provide: ConfigurationDataService, useValue: configurationDataService },
45-
{ provide: HALEndpointService, useValue: halService }
58+
{ provide: HALEndpointService, useValue: halService },
59+
{ provide: AuthService, useClass: AuthServiceStub },
60+
{ provide: FileService, useClass: FileServiceStub },
61+
{ provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
62+
{ provide: BitstreamDataService, useValue: bitstreamDataService },
4663
]
4764
}).compileComponents();
4865
});
@@ -53,7 +70,7 @@ describe('FileDescriptionComponent', () => {
5370

5471
// Mock the input value
5572
const fileInput = new MetadataBitstream();
56-
fileInput.id = 123;
73+
fileInput.id = '66efe81e-2950-483d-a065-bbdacd689f95';
5774
fileInput.name = 'testFile';
5875
fileInput.description = 'test description';
5976
fileInput.fileSize = 2048;

src/app/item-page/simple/field-components/preview-section/file-description/file-description.component.ts

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ import {HALEndpointService} from '../../../../../core/shared/hal-endpoint.servic
44
import {Router} from '@angular/router';
55
import {ConfigurationDataService} from '../../../../../core/data/configuration-data.service';
66
import {getFirstCompletedRemoteData, getFirstSucceededRemoteData} from '../../../../../core/shared/operators';
7-
import {BitstreamDataService} from "../../../../../core/data/bitstream-data.service";
8-
import {Bitstream} from "../../../../../core/shared/bitstream.model";
9-
import {RemoteData} from "../../../../../core/data/remote-data";
10-
import {followLink} from "../../../../../shared/utils/follow-link-config.model";
11-
import {fromEvent, merge, Observable, of} from "rxjs";
12-
import {FileService} from "../../../../../core/shared/file.service";
13-
import {distinctUntilChanged, switchMap, take} from "rxjs/operators";
14-
import {FeatureID} from "../../../../../core/data/feature-authorization/feature-id";
15-
import {hasValue} from "../../../../../shared/empty.util";
16-
import {AuthorizationDataService} from "../../../../../core/data/feature-authorization/authorization-data.service";
17-
import {AuthService} from "../../../../../core/auth/auth.service";
7+
import {BitstreamDataService} from '../../../../../core/data/bitstream-data.service';
8+
import {Bitstream} from '../../../../../core/shared/bitstream.model';
9+
import {RemoteData} from '../../../../../core/data/remote-data';
10+
import {followLink} from '../../../../../shared/utils/follow-link-config.model';
11+
import {fromEvent, merge, Observable, of} from 'rxjs';
12+
import {FileService} from '../../../../../core/shared/file.service';
13+
import {distinctUntilChanged, switchMap, take} from 'rxjs/operators';
14+
import {FeatureID} from '../../../../../core/data/feature-authorization/feature-id';
15+
import {hasValue} from '../../../../../shared/empty.util';
16+
import {AuthorizationDataService} from '../../../../../core/data/feature-authorization/authorization-data.service';
17+
import {AuthService} from '../../../../../core/auth/auth.service';
1818

1919
const allowedPreviewFormats = ['text/plain', 'text/html', 'application/zip', 'application/x-tar'];
2020
@Component({
@@ -29,10 +29,14 @@ export class FileDescriptionComponent implements OnInit {
2929
@Input()
3030
fileInput: MetadataBitstream;
3131

32+
@ViewChild('videoPreview') videoElement: ElementRef;
33+
3234
emailToContact: string;
3335
content_url$: Observable<string>;
3436
content_url: string;
3537
thumbnail_url$: Observable<string>;
38+
handlers_added = false;
39+
playPromise: Promise<void>;
3640

3741
constructor(protected halService: HALEndpointService,
3842
private router: Router,
@@ -50,14 +54,14 @@ export class FileDescriptionComponent implements OnInit {
5054
});
5155
this.content_url$ = this.bitstreamService.findById(this.fileInput.id, true, false, followLink('thumbnail'))
5256
.pipe(getFirstCompletedRemoteData(),
53-
switchMap((remoteData : RemoteData<Bitstream>) => {
57+
switchMap((remoteData: RemoteData<Bitstream>) => {
5458
if (remoteData.hasSucceeded) {
5559
this.thumbnail_url$ = remoteData.payload?.thumbnail.pipe(
5660
switchMap((thumbnailRD: RemoteData<Bitstream>) => {
5761
if (thumbnailRD.hasSucceeded) {
5862
return this.buildUrl(thumbnailRD.payload?._links.content.href);
5963
} else {
60-
return of("");
64+
return of('');
6165
}
6266
}),
6367
);
@@ -70,7 +74,6 @@ export class FileDescriptionComponent implements OnInit {
7074
});
7175
}
7276

73-
@ViewChild('videoPreview') videoElement: ElementRef;
7477
ngAfterViewInit() {
7578
const video = this.videoElement?.nativeElement;
7679

@@ -82,7 +85,7 @@ export class FileDescriptionComponent implements OnInit {
8285
this.auth.isAuthenticated().pipe(
8386
switchMap((isLoggedIn) => {
8487
if (isLoggedIn) {
85-
return this.authDataService.isAuthorized(FeatureID.CanDownload, this.content_url.replace('/content', ''))
88+
return this.authDataService.isAuthorized(FeatureID.CanDownload, this.content_url.replace('/content', ''));
8689
} else {
8790
return of(false);
8891
}
@@ -100,8 +103,6 @@ export class FileDescriptionComponent implements OnInit {
100103
}
101104
}
102105

103-
handlers_added = false;
104-
105106
private add_short_lived_token_handling_to_video_playback(video: HTMLVideoElement) {
106107
if (this.handlers_added) {
107108
return;
@@ -129,9 +130,6 @@ export class FileDescriptionComponent implements OnInit {
129130

130131
}
131132

132-
133-
playPromise;
134-
135133
private resetSource(currentTime?) {
136134
const video = this.videoElement?.nativeElement;
137135
//console.log("networkState in resetSource", video.networkState);
@@ -141,7 +139,9 @@ export class FileDescriptionComponent implements OnInit {
141139
// don't want to see The play() request was interrupted by...
142140
// https://developer.chrome.com/blog/play-request-was-interrupted
143141
this.updateSource(video, currentTime);
144-
}).catch(_ => {});
142+
}).catch(_ => {
143+
//do nothing
144+
});
145145
} else {
146146
this.updateSource(video, currentTime);
147147
}
@@ -151,7 +151,7 @@ export class FileDescriptionComponent implements OnInit {
151151
//console.log("Updating the src");
152152
this.buildUrl(this.content_url).subscribe(result => {
153153
video.src = result;
154-
if(currentTime) {
154+
if (currentTime) {
155155
video.currentTime = currentTime;
156156
}
157157
this.playPromise = video.play();

src/app/item-page/simple/field-components/preview-section/preview-section.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ describe('PreviewSectionComponent', () => {
4343

4444
// Set up the mock service's getMetadataBitstream method to return a simple stream
4545
const metadatabitstream = new MetadataBitstream();
46-
metadatabitstream.id = 123;
46+
metadatabitstream.id = '5974f1cf-f2ef-4e4c-8f6d-85ad6c52efde';
4747
metadatabitstream.name = 'test';
4848
metadatabitstream.description = 'test';
4949
metadatabitstream.fileSize = 1024;

0 commit comments

Comments
 (0)