finalize config

Author: FrancescoMolinaro

src/app/shared/cookies/browser-klaro.service.ts

@@ -21,11 +21,6 @@ import isEqual from 'lodash/isEqual';
 export interface CookieConsents {
   [key: string]: boolean;
 }
-
-export interface ThirdPartyMetric {
-  key: string;
-  enabled: boolean
-}
 /**
  * Metadata field to store a user's cookie consent preferences in
  */
@@ -111,13 +106,13 @@ export class BrowserKlaroService extends KlaroService {
       this.klaroConfig.translations.zz.consentNotice.description = 'cookies.consent.content-notice.description.no-privacy';
     }
 
-    if (environment.metricsConsents) {
+    if (hasValue(environment.metricsConsents)) {
       environment.metricsConsents.forEach((metric) => {
         if (metric.enabled) {
           this.klaroConfig.services.push(
             {
               name: metric.key,
-              purposes: ['thirdPartiesJs'],
+              purposes: ['thirdPartyJs'],
               required: false,
             }
           );

src/app/shared/metric/metric-altmetric/metric-altmetric.component.html

@@ -25,7 +25,7 @@
     </div>
   </div>
 </div>
-<div class="row d-flex align-items-center justify-content-center m-2"  *ngIf="!canLoadScript">
+<div class="row d-flex align-items-center justify-content-center m-2"  *ngIf="!canLoadScript && !isListElement">
   <div>
     {{ "third-party-metrics-cookies.message" | translate: {metricType: metric.metricType | titlecase} }}
     <div role="button" class="btn-link" (click)="requestSettingsConsent.emit(true)">{{"third-party-metrics-cookies.consent-settings" | translate}}</div>

src/app/shared/metric/metric-dimensions/metric-dimensions.component.html

@@ -25,7 +25,7 @@
     </div>
   </div>
 </div>
-<div class="row d-flex align-items-center justify-content-center m-2"  *ngIf="!canLoadScript">
+<div class="row d-flex align-items-center justify-content-center m-2"  *ngIf="!canLoadScript && !isListElement">
   <div>
     {{ "third-party-metrics-cookies.message" | translate: {metricType: metric.metricType | titlecase} }}
     <div role="button" class="btn-link" (click)="requestSettingsConsent.emit(true)">{{"third-party-metrics-cookies.consent-settings" | translate}}</div>

src/app/shared/metric/metric-plumx/metric-plumx.component.html

@@ -31,7 +31,7 @@
     </ng-container>
   </div>
 </div>
-<div class="row d-flex align-items-center justify-content-center m-2 alert-light"  *ngIf="!canLoadScript">
+<div class="row d-flex align-items-center justify-content-center m-2 alert-light"  *ngIf="!canLoadScript && !isListElement">
   <div>
     {{ "third-party-metrics-cookies.message" | translate: {metricType: metric.metricType | titlecase} }}
     <div role="button" class="btn-link" (click)="requestSettingsConsent.emit(true)">{{"third-party-metrics-cookies.consent-settings" | translate}}</div>

src/assets/i18n/en.json5

@@ -1757,7 +1757,7 @@
 
   "cookies.consent.ok": "That's ok",
 
-  "cookies.consent.save": "Save",
+  "cookies.consent.save": "Close",
 
   "cookies.consent.content-notice.title": "Cookie Consent",
 
@@ -1819,7 +1819,7 @@
 
   "cookies.consent.app.description.dimensions": "Dimensions analyses references from publications and calculates a set of article-level indicators. (https://www.dimensions.ai)",
 
-  "cookies.consent.purpose.thirdPartiesJs": "Third parties JavaScript",
+  "cookies.consent.purpose.thirdPartyJs": "Third-party JavaScript",
 
   "curation-task.task.citationpage.label": "Generate Citation Page",
 

src/config/app-config.interface.ts

@@ -31,7 +31,7 @@ import { FollowAuthorityMetadata } from './search-follow-metadata.interface';
 import { AdvancedAttachmentRenderingConfig } from './advanced-attachment-rendering.config';
 import { AttachmentRenderingConfig } from './attachment-rendering.config';
 import { SearchResultConfig } from './search-result-config.interface';
-import { ThirdPartyMetric } from '../app/shared/cookies/browser-klaro.service';
+import { ThirdPartyMetric } from "./third-party-metric-config";
 
 interface AppConfig extends Config {
   ui: UIServerConfig;

src/config/default-app-config.ts

@@ -34,7 +34,7 @@ import {
 } from './advanced-attachment-rendering.config';
 import { AttachmentRenderingConfig } from './attachment-rendering.config';
 import { SearchResultConfig } from './search-result-config.interface';
-import { ThirdPartyMetric } from '../app/shared/cookies/browser-klaro.service';
+import { ThirdPartyMetric } from "./third-party-metric-config";
 
 export class DefaultAppConfig implements AppConfig {
   production = false;

src/config/third-party-metric-config.ts

@@ -0,0 +1,4 @@
+export interface ThirdPartyMetric {
+  key: string;
+  enabled: boolean
+}