[DSC-2635] fix tests build

Author: Andrea Barbasso

src/app/core/auth/auth.effects.spec.ts

@@ -210,7 +210,6 @@ describe('AuthEffects', () => {
         const expected = cold('--b-', { b: new CheckAuthenticationTokenCookieAction() });
 
         expect(authEffects.authenticated$).toBeObservable(expected);
-        done();
       });
     });
   });

src/app/core/browse/search-manager.ts

@@ -145,12 +145,12 @@ export class SearchManager {
         if (item.entityType === followMetadata.type) {
           if (isArray(followMetadata.metadata)) {
             followMetadata.metadata.forEach((metadata) => {
-              Metadata.all(item.metadata, metadata, null, environment.followAuthorityMetadataValuesLimit)
+              Metadata.all(item.metadata, metadata, null, undefined, undefined, environment.followAuthorityMetadataValuesLimit)
                 .filter((metadataValue: MetadataValue) => Metadata.hasValidItemAuthority(metadataValue.authority))
                 .forEach((metadataValue: MetadataValue) => uuidMap[metadataValue.authority] = metadataValue);
             });
           } else {
-            Metadata.all(item.metadata, followMetadata.metadata, null, environment.followAuthorityMetadataValuesLimit)
+            Metadata.all(item.metadata, followMetadata.metadata, null, undefined, undefined, environment.followAuthorityMetadataValuesLimit)
               .filter((metadataValue: MetadataValue) => Metadata.hasValidItemAuthority(metadataValue.authority))
               .forEach((metadataValue: MetadataValue) => uuidMap[metadataValue.authority] = metadataValue);
           }

src/app/core/data/item-data.service.ts

@@ -31,7 +31,6 @@ import {
 } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { BrowseService } from '../browse/browse.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';

src/app/core/locale/locale.service.spec.ts

@@ -171,10 +171,11 @@ describe('LocaleService test suite', () => {
       testScheduler.run(({ expectObservable }) => {
         expectObservable(service.getLanguageCodeList()).toBe('(a|)', { a: ['fr;q=0.5', 'en-US;q=1', 'en;q=0.9'] });
       });
-        });
-      });
     });
 
+  });
+
+
     describe('getLanguageCodeFromCookie', () => {
       it('should return language from cookie', () => {
         spyOnGet.and.returnValue('de');

src/app/core/metadata/head-tag.service.ts

@@ -855,7 +855,7 @@ export class HeadTagService {
 
   private setGenericPageMetaTags() {
     const pageDocumentTitle = this._document.getElementsByTagName('title')[0].innerText;
-    const pageUrl = new URLCombiner(this.hardRedirectService.getCurrentOrigin(), this.router.url).toString();
+    const pageUrl = new URLCombiner(this.hardRedirectService.getBaseUrl(), this.router.url).toString();
     const genericPageOpenGraphType = 'website';
 
     this.setTitleTags(pageDocumentTitle);
@@ -871,6 +871,6 @@ export class HeadTagService {
   }
 
   private getUrlOrigin(): string {
-    return isPlatformBrowser(this.platformId) ? this.hardRedirectService.getCurrentOrigin() : this.origin;
+    return isPlatformBrowser(this.platformId) ? this.hardRedirectService.getBaseUrl() : this.origin;
   }
 }

src/app/core/shared/dspace-object.model.ts

@@ -135,7 +135,7 @@ export class DSpaceObject extends ListableObject implements CacheableObject {
    * @returns {MetadataValue[]} the matching values or an empty array.
    */
   limitedMetadata(keyOrKeys: string | string[], limit: number, valueFilter?: MetadataValueFilter): MetadataValue[] {
-    return Metadata.all(this.metadata, keyOrKeys, valueFilter, limit);
+    return Metadata.all(this.metadata, keyOrKeys, undefined, valueFilter, undefined, limit);
   }
 
   /**

src/app/core/shared/metadata.utils.spec.ts

@@ -183,7 +183,7 @@ describe('Metadata', () => {
 
   describe('hasValue method', () => {
     const testHasValue = (value, expected) =>
-      testMethod(Metadata.hasValue, 'boolean', value, null, expected);
+      testMethod(Metadata.hasValue, 'boolean', value, null, undefined, expected);
 
     describe('with undefined value', () => {
       testHasValue(undefined, false);

src/app/core/shared/metadata.utils.ts

@@ -75,9 +75,10 @@ export class Metadata {
         return matches;
       }
     }
-    for (const mdKey of Metadata.resolveKeys(metadata, keyOrKeys)) {
-      if (metadata[mdKey]) {
-        for (const candidate of metadata[mdKey]) {
+    for (const mdMap of mdMaps) {
+      for (const mdKey of Metadata.resolveKeys(mdMap, keyOrKeys)) {
+        if (mdMap[mdKey]) {
+          for (const candidate of mdMap[mdKey]) {
           if (Metadata.valueMatches(candidate as MetadataValue, filter)) {
             if (escapeHTML) {
               matches.push(Object.assign(new MetadataValue(), candidate, {
@@ -87,6 +88,7 @@ export class Metadata {
               matches.push(candidate as MetadataValue);
             }
           }
+          }
         }
       }
     }

src/app/cris-layout/pipes/ds-date.pipe.ts

@@ -30,7 +30,7 @@ export class DsDatePipe implements PipeTransform, OnDestroy {
   }
 
   transform(value: string, ...params: any[]): string {
-    const locale = this.localeService.getCurrentLanguageCode();
+    const locale = this.asyncPipe.transform(this.localeService.getCurrentLanguageCode());
     return isValidDate(value) ? localeDate(value, locale) : value;
   }
 

src/app/footer/footer.component.ts

@@ -15,7 +15,10 @@ import {
   Observable,
   of as observableOf,
 } from 'rxjs';
-import { take } from 'rxjs/operators';
+import {
+  take,
+  withLatestFrom,
+} from 'rxjs/operators';
 
 import {
   APP_CONFIG,
@@ -91,10 +94,13 @@ export class FooterComponent implements OnInit {
       style: '',
     };
     this.site = this.siteService.find().pipe(take(1));
-    this.siteService.find().pipe(take(1)).subscribe(
-      (site: Site) => {
+    this.siteService.find().pipe(
+      take(1),
+      withLatestFrom(this.locale.getCurrentLanguageCode()),
+    ).subscribe(
+      ([site, langCode]: [Site, string]) => {
         this.hasSiteFooterSections = !isEmpty(site?.firstMetadataValue('cris.cms.footer',
-          { language: this.locale.getCurrentLanguageCode() }));
+          { language: langCode }));
       },
     );
   }