Skip to content

Commit bcb28bb

Browse files
author
Joran De Braekeleer
committed
140086: Fix tests and formatting
1 parent 56648f0 commit bcb28bb

4 files changed

Lines changed: 73 additions & 56 deletions

File tree

‎src/app/bitstream-page/replace-bitstream-page/replace-bitstream-page.component.html‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
<ng-container *ngVar="(bitstreamRD$ | async) as bitstreamRD">
2-
<div class="container">
3-
<div>
4-
<h3>{{
5-
'bitstream.replace.page.header' | translate: {
6-
fileName: bitstreamRD.payload.name,
7-
fileSize: bitstreamRD.payload.sizeBytes | dsFileSize
8-
}
9-
}}</h3>
10-
<p>
11-
{{
12-
'bitstream.replace.page.content' | translate: {
13-
fileName: bitstreamRD.payload.name
14-
}
15-
}}
16-
</p>
17-
</div>
18-
<ds-uploader #uploader class="w-100"
19-
[dropMsg]="'item.bitstreams.upload.drop-message'"
20-
[dropOverDocumentMsg]="'item.bitstreams.upload.drop-message'"
21-
[enableDragOverDocument]="true"
22-
[uploadFilesOptions]="uploadFilesOptions"
23-
(onCompleteItem)="onCompleteItem($event)"
24-
(onUploadError)="onUploadError()"></ds-uploader>
25-
<div class="mb-2 d-flex">
26-
<ui-switch size="small"
27-
[(ngModel)]="shouldReplaceName"></ui-switch>
28-
<span class="font-weight-bold ms-2">{{ 'bitstream.replace.page.replace-name' | translate }}</span>
29-
</div>
30-
<div class="mb-2">
31-
<span [ngClass]="{ 'invisible': shouldReplaceName }" class="text-muted"> {{ 'bitstream.replace.page.replace-name-hint' | translate }}</span>
32-
</div>
33-
@if (bitstreamRD?.hasFailed) {
34-
<ds-error message="{{'error.bitstream' | translate}}"></ds-error>
35-
}
36-
@if (!bitstreamRD || bitstreamRD?.isLoading) {
37-
<ds-loading
38-
message="{{'loading.bitstream' | translate}}"></ds-loading>
39-
}
1+
@let bitstreamRD = bitstreamRD$ | async;
2+
<div class="container">
3+
<div>
4+
<h3>{{
5+
'bitstream.replace.page.header' | translate: {
6+
fileName: bitstreamRD.payload.name,
7+
fileSize: bitstreamRD.payload.sizeBytes | dsFileSize
8+
}
9+
}}</h3>
10+
<p>
11+
{{
12+
'bitstream.replace.page.content' | translate: {
13+
fileName: bitstreamRD.payload.name
14+
}
15+
}}
16+
</p>
17+
</div>
18+
<ds-uploader #uploader class="w-100"
19+
[dropMsg]="'item.bitstreams.upload.drop-message'"
20+
[dropOverDocumentMsg]="'item.bitstreams.upload.drop-message'"
21+
[enableDragOverDocument]="true"
22+
[uploadFilesOptions]="uploadFilesOptions"
23+
(onCompleteItem)="onCompleteItem($event)"
24+
(onUploadError)="onUploadError()"></ds-uploader>
25+
<div class="mb-2 d-flex">
26+
<ui-switch size="small"
27+
[(ngModel)]="shouldReplaceName"></ui-switch>
28+
<span class="font-weight-bold ms-2">{{ 'bitstream.replace.page.replace-name' | translate }}</span>
29+
</div>
30+
<div class="mb-2">
31+
<span [ngClass]="{ 'invisible': shouldReplaceName }"
32+
class="text-muted"> {{ 'bitstream.replace.page.replace-name-hint' | translate }}</span>
33+
</div>
34+
@if (bitstreamRD?.hasFailed) {
35+
<ds-error message="{{'error.bitstream' | translate}}"></ds-error>
36+
}
37+
@if (!bitstreamRD || bitstreamRD?.isLoading) {
38+
<ds-loading
39+
message="{{'loading.bitstream' | translate}}"></ds-loading>
40+
}
4041

41-
<div class="button-row bottom">
42-
<div class="mt-4 float-right">
43-
<button class="back-button btn btn-outline-secondary"
44-
(click)="back()"><i
45-
class="fas fa-arrow-left"></i>
46-
<span class="d-none d-sm-inline">&nbsp;{{ "bitstream.replace.page.button.return" | translate }}</span>
47-
</button>
48-
<button class="save-button btn btn-primary" (click)="save(uploader);"><i
49-
class="fas fa-save"></i>
50-
<span class="d-none d-sm-inline">&nbsp;{{ "bitstream.replace.page.button.save" | translate }}</span>
51-
</button>
52-
</div>
42+
<div class="button-row bottom">
43+
<div class="mt-4 float-right">
44+
<button class="back-button btn btn-outline-secondary"
45+
(click)="back()"><i
46+
class="fas fa-arrow-left"></i>
47+
<span class="d-none d-sm-inline">&nbsp;{{ "bitstream.replace.page.button.return" | translate }}</span>
48+
</button>
49+
<button class="save-button btn btn-primary" (click)="save(uploader);"><i
50+
class="fas fa-save"></i>
51+
<span class="d-none d-sm-inline">&nbsp;{{ "bitstream.replace.page.button.save" | translate }}</span>
52+
</button>
5353
</div>
5454
</div>
55-
</ng-container>
55+
</div>

‎src/app/bitstream-page/replace-bitstream-page/replace-bitstream-page.component.spec.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
} from '@angular/router';
1818
import { AuthService } from '@dspace/core/auth/auth.service';
1919
import { RequestService } from '@dspace/core/data/request.service';
20+
import { LocaleService } from '@dspace/core/locale/locale.service';
2021
import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
2122
import { Bitstream } from '@dspace/core/shared/bitstream.model';
2223
import { AuthServiceStub } from '@dspace/core/testing/auth-service.stub';
@@ -30,7 +31,6 @@ import { UploaderComponent } from '../../shared/upload/uploader/uploader.compone
3031
import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.model';
3132
import { UploaderProperties } from '../../shared/upload/uploader/uploader-properties.model';
3233
import { FileSizePipe } from '../../shared/utils/file-size-pipe';
33-
import { VarDirective } from '../../shared/utils/var.directive';
3434
import { ReplaceBitstreamPageComponent } from './replace-bitstream-page.component';
3535

3636
describe('ReplaceBitstreamPageComponent', () => {
@@ -49,13 +49,18 @@ describe('ReplaceBitstreamPageComponent', () => {
4949
const route = { data: of({ bitstream: createSuccessfulRemoteDataObject(bitstream) }) };
5050
const requestService = jasmine.createSpyObj('requestService', ['setStaleByHrefSubstring']);
5151
const router = new RouterStub();
52+
let localeService;
53+
const languageList = ['en;q=1', 'de;q=0.8'];
54+
const mockLocaleService = jasmine.createSpyObj('LocaleService', {
55+
getCurrentLanguageCode: jasmine.createSpy('getCurrentLanguageCode'),
56+
getLanguageCodeList: of(languageList),
57+
});
5258

5359
beforeEach(waitForAsync(() => {
5460
TestBed.configureTestingModule({
5561
imports: [
5662
ReplaceBitstreamPageComponent,
5763
TranslateModule.forRoot(),
58-
VarDirective,
5964
FileSizePipe,
6065
],
6166
providers: [
@@ -65,6 +70,7 @@ describe('ReplaceBitstreamPageComponent', () => {
6570
{ provide: AuthService, useClass: AuthServiceStub },
6671
{ provide: Router, useValue: router },
6772
{ provide: RequestService, useValue: requestService },
73+
{ provide: LocaleService, useValue: mockLocaleService },
6874
],
6975
}).overrideComponent(ReplaceBitstreamPageComponent, {
7076
remove: { imports: [UploaderComponent] },
@@ -74,6 +80,8 @@ describe('ReplaceBitstreamPageComponent', () => {
7480
);
7581

7682
beforeEach(() => {
83+
localeService = TestBed.inject(LocaleService);
84+
localeService.getCurrentLanguageCode.and.returnValue(of('en'));
7785
fixture = TestBed.createComponent(ReplaceBitstreamPageComponent);
7886
component = fixture.componentInstance;
7987
notificationsService = TestBed.inject(NotificationsService);

‎src/app/bitstream-page/replace-bitstream-page/replace-bitstream-page.component.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.comp
3838
import { UploaderComponent } from '../../shared/upload/uploader/uploader.component';
3939
import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.model';
4040
import { FileSizePipe } from '../../shared/utils/file-size-pipe';
41-
import { VarDirective } from '../../shared/utils/var.directive';
4241

4342
@Component({
4443
selector: 'ds-replace-bitstream-page',
@@ -54,7 +53,6 @@ import { VarDirective } from '../../shared/utils/var.directive';
5453
TranslatePipe,
5554
UiSwitchModule,
5655
UploaderComponent,
57-
VarDirective,
5856
],
5957
})
6058
export class ReplaceBitstreamPageComponent implements OnInit {

‎src/app/submission/sections/upload/file/replace/submission-section-upload-file-replace/submission-section-upload-file-replace.component.spec.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
} from '@angular/core/testing';
1212
import { By } from '@angular/platform-browser';
1313
import { AuthService } from '@dspace/core/auth/auth.service';
14+
import { LocaleService } from '@dspace/core/locale/locale.service';
1415
import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
1516
import { Bitstream } from '@dspace/core/shared/bitstream.model';
1617
import { HALEndpointService } from '@dspace/core/shared/hal-endpoint.service';
@@ -21,6 +22,7 @@ import { SectionsServiceStub } from '@dspace/core/testing/sections-service.stub'
2122
import { SubmissionServiceStub } from '@dspace/core/testing/submission-service.stub';
2223
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
2324
import { TranslateModule } from '@ngx-translate/core';
25+
import { of } from 'rxjs';
2426

2527
import { UploaderComponent } from '../../../../../../shared/upload/uploader/uploader.component';
2628
import { UploaderOptions } from '../../../../../../shared/upload/uploader/uploader-options.model';
@@ -50,6 +52,12 @@ describe('SubmissionSectionUploadFileReplaceComponent', () => {
5052
});
5153
const fileIndex = '0';
5254
const submissionId = '0';
55+
let localeService;
56+
const languageList = ['en;q=1', 'de;q=0.8'];
57+
const mockLocaleService = jasmine.createSpyObj('LocaleService', {
58+
getCurrentLanguageCode: jasmine.createSpy('getCurrentLanguageCode'),
59+
getLanguageCodeList: of(languageList),
60+
});
5361

5462
beforeEach(async () => {
5563
await TestBed.configureTestingModule({
@@ -67,12 +75,15 @@ describe('SubmissionSectionUploadFileReplaceComponent', () => {
6775
{ provide: SectionsService, useClass: SectionsServiceStub },
6876
{ provide: SubmissionService, useClass: SubmissionServiceStub },
6977
{ provide: NgbActiveModal },
78+
{ provide: LocaleService, useValue: mockLocaleService },
7079
],
7180
}).overrideComponent(SubmissionSectionUploadFileReplaceComponent, {
7281
remove: { imports: [UploaderComponent] },
7382
add: { imports: [TestUploaderComponent] },
7483
}).compileComponents();
7584

85+
localeService = TestBed.inject(LocaleService);
86+
localeService.getCurrentLanguageCode.and.returnValue(of('en'));
7687
fixture = TestBed.createComponent(SubmissionSectionUploadFileReplaceComponent);
7788
component = fixture.componentInstance;
7889
component.fileIndex = fileIndex;

0 commit comments

Comments
 (0)