diff --git a/package.json b/package.json index 445badfd58290a2ada2d010edd747f8dd6539b96..a51041ec529e669eaed022981ef5ff5ebd4a1bde 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "webapp", - "version": "2.6.4", + "version": "2.6.5", "license": "GNU Affero General Public License v3.0", "scripts": { "ng": "ng", diff --git a/src/app/dataset-detail/components/dataset-info/info-chart/info-chart.component.ts b/src/app/dataset-detail/components/dataset-info/info-chart/info-chart.component.ts index 639547eb85a3701142fc763618e07ebe0bbe4594..d9ddd2e3c592e6e4cba7ea04aee97661efde29ba 100644 --- a/src/app/dataset-detail/components/dataset-info/info-chart/info-chart.component.ts +++ b/src/app/dataset-detail/components/dataset-info/info-chart/info-chart.component.ts @@ -151,7 +151,7 @@ export class InfoChartComponent implements OnInit { } if (value >= 1000) { value = value / 1000; - return value.toLocaleString() + ' K'; + return value.toLocaleString() + ' k'; } return value.toLocaleString(); } diff --git a/src/app/dataset-detail/components/dataset-info/info-summary/info-summary.component.html b/src/app/dataset-detail/components/dataset-info/info-summary/info-summary.component.html index f7aaa0d124d9392f861f3794855949a648b794d7..ae769a5653792889362448e57487562eb2dc2bca 100644 --- a/src/app/dataset-detail/components/dataset-info/info-summary/info-summary.component.html +++ b/src/app/dataset-detail/components/dataset-info/info-summary/info-summary.component.html @@ -54,11 +54,12 @@ class="greylightcolor" /> </svg> - <span *ngIf="summaryInfo.viewsNumber" i18n="@@dataset.info.viewsNumber">{{ summaryInfo.viewsNumber }} - view(s)during the last month</span> - <span *ngIf="!summaryInfo.viewsNumber">0</span> - - <span i18n="@@dataset.info.view">view</span> + <span *ngIf="summaryInfo.viewsNumber; else noView" i18n="@@dataset.info.viewsNumber">{{ summaryInfo.viewsNumber }} + view(s)during the last month + </span> + <ng-template #noView> + 0 <span i18n="@@dataset.info.view">view</span> + </ng-template> </div> <div> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"> @@ -70,4 +71,4 @@ <span>{{ summaryInfo.dataType }}</span> </div> </div> - </div> \ No newline at end of file + </div> diff --git a/src/app/dataset-detail/components/dataset-table/dataset-table.component.html b/src/app/dataset-detail/components/dataset-table/dataset-table.component.html index a28c122449ba72f86aee367538486880146b7b9a..0e58a6924b79401dcb603f60c675bd2814ac30df 100644 --- a/src/app/dataset-detail/components/dataset-table/dataset-table.component.html +++ b/src/app/dataset-detail/components/dataset-table/dataset-table.component.html @@ -18,6 +18,7 @@ <div [class]="'item-grid' + ' item-grid-' + indexData" [ngClass]="{'is-first': indexRow === 0, 'selected': element.id === selectedFeature, 'visited': isVisited(element.id) }" *ngFor="let key of displayedProperties; let indexRow=index;" (click)="emitSelectedData(element)"> + <ng-container *ngIf="!isPropertyComplex(element,key)"> <span *ngIf="!isUrl(element.properties[key]); else urlPropTemplate" class="data-property-value">{{ element.properties[key] }}</span> @@ -27,7 +28,7 @@ </ng-template> </ng-container> <span *ngIf="isPropertyComplex(element,key)"> - <span class="tooltip-right" i18n-data-tooltip="@@dataset.data.tooltip" + <span i18n-data-tooltip="@@dataset.data.tooltip" data-tooltip="Complex property, please unfold the line"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="14" fill="none" viewBox="0 0 16 14"> <path fill="#fff" @@ -38,4 +39,4 @@ </span> </div> </ng-container> -</div> \ No newline at end of file +</div> diff --git a/src/app/user/interceptors/xsrf-token.interceptor.ts b/src/app/user/interceptors/xsrf-token.interceptor.ts index 20a8cbeeac9ea35b0a5940956066cc4045a35f93..85028a59accad139a0a84117d7c455e4d6b2f478 100644 --- a/src/app/user/interceptors/xsrf-token.interceptor.ts +++ b/src/app/user/interceptors/xsrf-token.interceptor.ts @@ -2,6 +2,7 @@ import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent } from '@angular/c import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { CookieService } from 'ngx-cookie-service'; +import { APP_CONFIG } from '../../core/services/app-config.service'; @Injectable() export class XSRFTokenInterceptor implements HttpInterceptor { @@ -16,9 +17,11 @@ export class XSRFTokenInterceptor implements HttpInterceptor { let request = req; if (xsrfToken) { - request = req.clone({ - headers: req.headers.set('x-xsrf-token', xsrfToken), - }); + if (!new RegExp(`^${APP_CONFIG.backendUrls.datasetUsageStatistics}`).test(req.url)) { + request = req.clone({ + headers: req.headers.set('x-xsrf-token', xsrfToken), + }); + } } return next.handle(request); }