feat: next test fix

feat: first test fix

feat: fix unit

Author: pcg-kk

src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts

@@ -16,7 +16,10 @@ import {
   DynamicFormService,
   DynamicInputModel,
 } from '@ng-dynamic-forms/core';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
 import { of as observableOf } from 'rxjs';
 
@@ -28,6 +31,7 @@ import { Community } from '../../../../core/shared/community.model';
 import { hasValue } from '../../../empty.util';
 import { FormComponent } from '../../../form/form.component';
 import { AuthServiceMock } from '../../../mocks/auth.service.mock';
+import { translateServiceStub } from '../../../mocks/translate.service.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
@@ -55,8 +59,8 @@ describe('ComColFormComponent', () => {
   const dcTitle = 'dc.title';
   const dcAbstract = 'dc.description.abstract';
 
-  const abstractMD = { [dcAbstract]: [{ value: 'Community description', language: null }] };
-  const newTitleMD = { [dcTitle]: [{ value: 'New Community Title', language: null }] };
+  const abstractMD = { [dcAbstract]: [{ value: 'Community description', language: 'en_US' }] };
+  const newTitleMD = { [dcTitle]: [{ value: 'New Community Title', language: 'en_US' }] };
   const formModel = [
     new DynamicInputModel({
       id: 'title',
@@ -103,6 +107,7 @@ describe('ComColFormComponent', () => {
         { provide: AuthService, useValue: new AuthServiceMock() },
         { provide: RequestService, useValue: requestServiceStub },
         { provide: ObjectCacheService, useValue: objectCacheStub },
+        { provide: TranslateService, useValue: translateServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
@@ -132,7 +137,7 @@ describe('ComColFormComponent', () => {
     describe('onSubmit', () => {
       beforeEach(() => {
         spyOn(comp.submitForm, 'emit');
-        comp.formModel = formModel;
+        comp.formModels.set('en_US', formModel);
       });
 
       it('should emit the new version of the community', () => {
@@ -143,37 +148,38 @@ describe('ComColFormComponent', () => {
           {
             op: 'replace',
             path: '/metadata/dc.title',
-            value: {
+            value: [{
               value: 'New Community Title',
-              language: null,
-            },
+              language: 'en_US',
+            }],
           },
           {
             op: 'replace',
             path: '/metadata/dc.description.abstract',
-            value: {
+            value: [{
               value: 'Community description',
-              language: null,
-            },
+              language: 'en_US',
+            }],
           },
         ];
 
+        const expectedDso = Object.assign({}, comp.dso, {
+          metadata: {
+            'dc.title': [{
+              value: 'New Community Title',
+              language: 'en_US',
+            }],
+            'dc.description.abstract': [{
+              value: 'Community description',
+              language: 'en_US',
+            }],
+          },
+          type: Community.type,
+        });
+
         expect(comp.submitForm.emit).toHaveBeenCalledWith(
           {
-            dso: Object.assign({}, comp.dso, {
-              metadata: {
-                'dc.title': [{
-                  value: 'New Community Title',
-                  language: null,
-                }],
-                'dc.description.abstract': [{
-                  value: 'Community description',
-                  language: null,
-                }],
-              },
-              type: Community.type,
-            },
-            ),
+            dso: expectedDso,
             operations: operations,
           },
         );
@@ -314,8 +320,16 @@ describe('ComColFormComponent', () => {
   function initComponent(dso: Community) {
     fixture = TestBed.createComponent(ComColFormComponent);
     comp = fixture.componentInstance;
-    comp.formModel = [];
+    comp.formModels.set('en_US', formModel);
+    comp.defaultLanguageCode = 'en_US';
     comp.dso = dso;
+    comp.dso.firstMetadataValue = (name, language) => {
+      if (name === 'dc.title') {
+        return newTitleMD[dcTitle][0].value;
+      } else if (name === 'dc.description.abstract') {
+        return abstractMD[dcAbstract][0].value;
+      }
+    };
     (comp as any).type = Community.type;
     comp.uploaderComponent = { uploader: {} } as any;
 

src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts

@@ -158,7 +158,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
   /**
    * All languages used by application
    */
-  languages: LangConfig[];
+  languages: LangConfig[] = [];
 
   /**
    * The uploader configuration options

src/app/shared/mocks/translate.service.mock.ts

@@ -1,10 +1,22 @@
+import { EventEmitter } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
+import { of } from 'rxjs';
 
 export function getMockTranslateService(): TranslateService {
   return jasmine.createSpyObj('translateService', {
     get: jasmine.createSpy('get'),
     use: jasmine.createSpy('use'),
     instant: jasmine.createSpy('instant'),
     setDefaultLang: jasmine.createSpy('setDefaultLang'),
+    currentLang: 'en_US',
   });
 }
+
+export const translateServiceStub = {
+  get: () => of('translated-text'),
+  instant: () => 'translated-text',
+  onLangChange: new EventEmitter(),
+  onTranslationChange: new EventEmitter(),
+  onDefaultLangChange: new EventEmitter(),
+  currentLang: 'en_US',
+};

src/app/shared/object-list/collection-list-element/collection-list-element.component.html

@@ -8,6 +8,6 @@
   <span class="pr-2">&nbsp;</span>
   <span *ngIf="object.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-self-center archived-items-lead">{{object.archivedItemsCount}}</span>
 </div>
-<div *ngIf="object.shortDescription" class="text-muted abstract-text">
-    {{object.shortDescription}}
+<div *ngIf="object.shortDescription(translateService.currentLang) as shortDescription" class="text-muted abstract-text">
+    {{shortDescription}}
 </div>

src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts

@@ -9,10 +9,12 @@ import {
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { Collection } from '../../../core/shared/collection.model';
 import { DSONameServiceMock } from '../../mocks/dso-name.service.mock';
+import { translateServiceStub } from '../../mocks/translate.service.mock';
 import { ActivatedRouteStub } from '../../testing/active-router.stub';
 import { CollectionListElementComponent } from './collection-list-element.component';
 
@@ -72,6 +74,7 @@ describe('CollectionListElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: 'objectElementProvider', useValue: (mockCollectionWithAbstract) },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+        { provide: TranslateService, useValue: translateServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CollectionListElementComponent, {

src/app/shared/object-list/collection-list-element/collection-list-element.component.ts

@@ -1,7 +1,9 @@
 import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { Collection } from '../../../core/shared/collection.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
@@ -18,4 +20,11 @@ import { AbstractListableElementComponent } from '../../object-collection/shared
  * Component representing list element for a collection
  */
 @listableObjectComponent(Collection, ViewMode.ListElement)
-export class CollectionListElementComponent extends AbstractListableElementComponent<Collection> {}
+export class CollectionListElementComponent extends AbstractListableElementComponent<Collection> {
+  constructor(
+    public dsoNameService: DSONameService,
+    public translateService: TranslateService,
+  ) {
+    super(dsoNameService);
+  }
+}

src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts

@@ -9,10 +9,12 @@ import {
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { Community } from '../../../core/shared/community.model';
 import { DSONameServiceMock } from '../../mocks/dso-name.service.mock';
+import { translateServiceStub } from '../../mocks/translate.service.mock';
 import { ActivatedRouteStub } from '../../testing/active-router.stub';
 import { CommunityListElementComponent } from './community-list-element.component';
 
@@ -49,6 +51,7 @@ describe('CommunityListElementComponent', () => {
         { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: 'objectElementProvider', useValue: (mockCommunityWithAbstract) },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+        { provide: TranslateService, useValue: translateServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CommunityListElementComponent, {

src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html

@@ -4,6 +4,6 @@
     <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
     <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
     <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
-    <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+    <div *ngIf="dso.shortDescription(translateService.currentLang)" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
   </div>
 </div>

src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts

@@ -10,12 +10,14 @@ import {
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Collection } from '../../../../core/shared/collection.model';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { translateServiceStub } from '../../../mocks/translate.service.mock';
 import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { ActivatedRouteStub } from '../../../testing/active-router.stub';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
@@ -73,6 +75,7 @@ describe('CollectionSearchResultListElementComponent', () => {
         { provide: APP_CONFIG, useValue: environmentUseThumbs },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
         { provide: ThemeService, useValue: getMockThemeService() },
+        { provide: TranslateService, useValue: translateServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CollectionSearchResultListElementComponent, {

src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts

@@ -2,14 +2,24 @@ import {
   NgClass,
   NgIf,
 } from '@angular/common';
-import { Component } from '@angular/core';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
 import { RouterLink } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Collection } from '../../../../core/shared/collection.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component';
 import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { SearchResultListElementComponent } from '../search-result-list-element.component';
 
 @Component({
@@ -30,6 +40,13 @@ export class CollectionSearchResultListElementComponent extends SearchResultList
    */
   showThumbnails: boolean;
 
+  constructor(protected truncatableService: TruncatableService,
+              public dsoNameService: DSONameService,
+              public translateService: TranslateService,
+              @Inject(APP_CONFIG) protected appConfig?: AppConfig) {
+    super(truncatableService, dsoNameService, appConfig);
+  }
+
   ngOnInit(): void {
     super.ngOnInit();
     this.showThumbnails = this.showThumbnails ?? this.appConfig.browseBy.showThumbnails;