Merge pull request #5110 from saschaszott/saschaszott-patch-16

[Port dspace-9_x] Enhance FileSizePipe to support localization

Author: tdonohue

src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts

@@ -16,6 +16,7 @@ import { APP_CONFIG } from 'src/config/app-config.interface';
 import { environment } from 'src/environments/environment';
 
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { LocaleService } from '../../../../core/locale/locale.service';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
@@ -37,6 +38,12 @@ import { FullFileSectionComponent } from './full-file-section.component';
 describe('FullFileSectionComponent', () => {
   let comp: FullFileSectionComponent;
   let fixture: ComponentFixture<FullFileSectionComponent>;
+  let localeService: any;
+  const languageList = ['en;q=1', 'de;q=0.8'];
+  const mockLocaleService = jasmine.createSpyObj('LocaleService', {
+    getCurrentLanguageCode: jasmine.createSpy('getCurrentLanguageCode'),
+    getLanguageCodeList: of(languageList),
+  });
 
   const mockBitstream: Bitstream = Object.assign(new Bitstream(),
     {
@@ -93,6 +100,7 @@ describe('FullFileSectionComponent', () => {
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: SearchConfigurationService, useValue: jasmine.createSpyObj(['getCurrentConfiguration']) },
         { provide: PaginationService, useValue: paginationService },
+        { provide: LocaleService, useValue: mockLocaleService },
         { provide: APP_CONFIG, useValue: environment },
       ],
       schemas: [NO_ERRORS_SCHEMA],
@@ -104,6 +112,8 @@ describe('FullFileSectionComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
+    localeService = TestBed.inject(LocaleService);
+    localeService.getCurrentLanguageCode.and.returnValue(of('en'));
     fixture = TestBed.createComponent(FullFileSectionComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();

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

@@ -20,6 +20,7 @@ import {
   APP_DATA_SERVICES_MAP,
 } from '../../../../../config/app-config.interface';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { LocaleService } from '../../../../core/locale/locale.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
 import { XSRFService } from '../../../../core/xsrf/xsrf.service';
@@ -40,6 +41,12 @@ import { FileSectionComponent } from './file-section.component';
 describe('FileSectionComponent', () => {
   let comp: FileSectionComponent;
   let fixture: ComponentFixture<FileSectionComponent>;
+  let localeService: any;
+  const languageList = ['en;q=1', 'de;q=0.8'];
+  const mockLocaleService = jasmine.createSpyObj('LocaleService', {
+    getCurrentLanguageCode: jasmine.createSpy('getCurrentLanguageCode'),
+    getLanguageCodeList: of(languageList),
+  });
 
   const bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
     findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([])),
@@ -90,6 +97,7 @@ describe('FileSectionComponent', () => {
         { provide: APP_CONFIG, useValue: environment },
         { provide: ThemeService, useValue: getMockThemeService() },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+        { provide: LocaleService, useValue: mockLocaleService },
         provideMockStore(),
       ],
       schemas: [NO_ERRORS_SCHEMA],
@@ -105,6 +113,8 @@ describe('FileSectionComponent', () => {
   }));
 
   beforeEach(waitForAsync(() => {
+    localeService = TestBed.inject(LocaleService);
+    localeService.getCurrentLanguageCode.and.returnValue(of('en'));
     fixture = TestBed.createComponent(FileSectionComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();

src/app/process-page/detail/process-detail.component.spec.ts

@@ -27,6 +27,7 @@ import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { LocaleService } from '../../core/locale/locale.service';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { ThemedFileDownloadLinkComponent } from '../../shared/file-download-link/themed-file-download-link.component';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
@@ -60,6 +61,12 @@ describe('ProcessDetailComponent', () => {
   let router: RouterStub;
   let modalService;
   let notificationsService: NotificationsServiceStub;
+  let localeService: any;
+  const languageList = ['en;q=1', 'de;q=0.8'];
+  const mockLocaleService = jasmine.createSpyObj('LocaleService', {
+    getCurrentLanguageCode: jasmine.createSpy('getCurrentLanguageCode'),
+    getLanguageCodeList: of(languageList),
+  });
 
   let process: Process;
   let fileName: string;
@@ -169,6 +176,7 @@ describe('ProcessDetailComponent', () => {
         { provide: NgbModal, useValue: modalService },
         { provide: NotificationsService, useValue: notificationsService },
         { provide: Router, useValue: router },
+        { provide: LocaleService, useValue: mockLocaleService },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     })
@@ -186,7 +194,10 @@ describe('ProcessDetailComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(ProcessDetailComponent);
     component = fixture.componentInstance;
+    localeService = TestBed.inject(LocaleService);
+    localeService.getCurrentLanguageCode.and.returnValue(of('en'));
   });
+
   afterEach(fakeAsync(() => {
     TestBed.resetTestingModule();
     fixture.destroy();

src/app/shared/utils/file-size-pipe.ts

@@ -3,6 +3,9 @@ import {
   PipeTransform,
 } from '@angular/core';
 import { filesize } from 'filesize';
+import { take } from 'rxjs/operators';
+
+import { LocaleService } from '../../core/locale/locale.service';
 
 /*
  * Convert bytes into largest possible unit.
@@ -18,7 +21,20 @@ import { filesize } from 'filesize';
   name: 'dsFileSize',
 })
 export class FileSizePipe implements PipeTransform {
+
+  private currentLocale: string;
+
+  constructor(private localeService: LocaleService) {
+    this.localeService.getCurrentLanguageCode().pipe(take(1)).subscribe(locale => {
+      this.currentLocale = locale;
+    });
+  }
+
   transform(bytes: number = 0, precision: number = 2): string {
-    return filesize(bytes, { standard: 'jedec', round: precision });
+    return filesize(bytes, {
+      standard: 'jedec',
+      round: precision,
+      locale: this.currentLocale,
+    });
   }
 }

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

@@ -10,7 +10,9 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
 
+import { LocaleService } from '../../../../../core/locale/locale.service';
 import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { FormComponent } from '../../../../../shared/form/form.component';
 import { mockUploadFiles } from '../../../../../shared/mocks/submission.mock';
@@ -24,6 +26,12 @@ describe('SubmissionSectionUploadFileViewComponent test suite', () => {
   let comp: SubmissionSectionUploadFileViewComponent;
   let compAsAny: any;
   let fixture: ComponentFixture<SubmissionSectionUploadFileViewComponent>;
+  let localeService: any;
+  const languageList = ['en;q=1', 'de;q=0.8'];
+  const mockLocaleService = jasmine.createSpyObj('LocaleService', {
+    getCurrentLanguageCode: jasmine.createSpy('getCurrentLanguageCode'),
+    getLanguageCodeList: of(languageList),
+  });
 
   const fileData: any = mockUploadFiles[0];
 
@@ -38,6 +46,7 @@ describe('SubmissionSectionUploadFileViewComponent test suite', () => {
       ],
       providers: [
         SubmissionSectionUploadFileViewComponent,
+        { provide: LocaleService, useValue: mockLocaleService },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
@@ -56,14 +65,15 @@ describe('SubmissionSectionUploadFileViewComponent test suite', () => {
     let testComp: TestComponent;
     let testFixture: ComponentFixture<TestComponent>;
 
-    // synchronous beforeEach
-    beforeEach(() => {
+    beforeEach(waitForAsync(async () => {
       const html = `
       <ds-submission-section-upload-file-view [fileData]="fileData"></ds-submission-section-upload-file-view>`;
 
       testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      localeService = TestBed.inject(LocaleService);
+      localeService.getCurrentLanguageCode.and.returnValue(of('en'));
       testComp = testFixture.componentInstance;
-    });
+    }));
 
     afterEach(() => {
       testFixture.destroy();
@@ -77,11 +87,13 @@ describe('SubmissionSectionUploadFileViewComponent test suite', () => {
   });
 
   describe('', () => {
-    beforeEach(() => {
+    beforeEach(waitForAsync(async () => {
+      localeService = TestBed.inject(LocaleService);
+      localeService.getCurrentLanguageCode.and.returnValue(of('en'));
       fixture = TestBed.createComponent(SubmissionSectionUploadFileViewComponent);
       comp = fixture.componentInstance;
       compAsAny = comp;
-    });
+    }));
 
     afterEach(() => {
       fixture.destroy();