Skip to content
Snippets Groups Projects
Commit 73758e2b authored by ddamiron's avatar ddamiron
Browse files

hotfix Cors error in restheart header 

translate English text into French
parent 3cc5dee9
Branches
Tags
3 merge requests!10New updated datalog,!9add all datalog components and services into angular gui,!14Version 1.3.0
Hide whitespace changes
Inline Side-by-side
Showing
with 39 additions and 32 deletions
src/app/components/logs-dashboard/logs-home/logs-home.component.ts
+ 8
− 1
View file @ 73758e2b
......@@ -4,6 +4,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { ILogs } from 'src/app/models/logs.model';
import { ISimpleTab } from 'src/app/models/basic-tabs.model';
import { IPageHeaderInfo } from 'src/app/models/page.model';
import { NotificationService } from 'src/app/services';
@Component({
selector: 'app-logs-home',
......@@ -38,6 +39,7 @@ export class LogsHomeComponent implements OnInit {
];
constructor(
private _dataLogsService: DataLogsService,
private _notificationService: NotificationService,
private _route: ActivatedRoute,
private _router: Router,
) { }
......@@ -65,13 +67,18 @@ export class LogsHomeComponent implements OnInit {
this.isRestheartDown = false;
},
(error) => {
this._notificationService.notify(
{
type: 'error',
message: "Le serveur restheart n'est pas disponible.",
});
this.allFields = [];
this.nbSessionId = 0;
this.nbUuid = 0;
this.nbSlug = 0;
this.slugsList = [];
this.sessionsList = [];
this.serverDownMessage = 'Restheart server is not available.';
this.serverDownMessage = "Le serveur restheart n'est pas disponible.";
});
}
tabsToggler(tabName) {
......
src/app/components/logs-dashboard/logs-sessions/logs-sessions.component.html
+ 8
− 8
View file @ 73758e2b
......@@ -12,17 +12,17 @@
<div class="columns is-centered is-marginless">
<div class="column is-6 has-text-left">
<P>{{ childNbSessions }} session(s) in the database</P>
<P>{{ childNbSessions }} session(s) dans la base de données</P>
</div>
<div class="column is-6 has-text-left">
<p>For each session, values below are for the latest slug.</p>
<p>Pour chaque session, les valeurs affichées concernent le slug le plus récent.</p>
</div>
</div>
<div class="table entity-list-table">
<div class="header columns is-marginless">
<div class="column is-4 has-text-centered">
<span (click)="sortBy('name')" class="is-sortable">
<span class="is-sortable">
<span class="column-title">SessionId</span>
<p></p>
</span>
......@@ -37,7 +37,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Nb of Slugs</span>
<span class="column-title">Nb de Slugs</span>
</span>
</div>
<div class="column is-2 has-text-left">
......@@ -50,7 +50,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Latest Completion Date</span>
<span class="column-title">Dernière date d'exécution</span>
</span>
</div>
<div class="column is-1 has-text-left">
......@@ -63,7 +63,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Duration</span>
<span class="column-title">Durée</span>
</span>
</div>
<div class="column is-1 has-text-left">
......@@ -117,7 +117,7 @@
</div>
<div class="column is-1 has-text-left actions">
{{ session.latest.count.INFO ? session.latest.count.INFO : 0 }}
</div>
</div>
<div class="column is-1 has-text-left actions">
{{ session.latest.count.ERROR ? 'Yes ('+session.latest.count.ERROR+')':'No'}}
</div>
......@@ -141,4 +141,4 @@
<p class="bold-white">Reset</p>
</a>
</div>
</div>
\ No newline at end of file
</div>
src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.html
+ 7
− 7
View file @ 73758e2b
......@@ -12,10 +12,10 @@
<div class="columns is-centered is-marginless">
<div class="column is-6 has-text-left">
<P>{{ childNbSlugs }} slug(s) in database</P>
<P>{{ childNbSlugs }} slug(s) dans la base de données</P>
</div>
<div class="column is-6 has-text-left">
<p>For each slug, values below are for the latest session.</p>
<p>Pour chaque slug, les valeurs affichées concernent la session la plus récente.</p>
</div>
</div>
<div class="table entity-list-table">
......@@ -34,7 +34,7 @@
</span>
</div>
<div class="column is-1 has-text-left">
<span class="column-title">Full Data?</span>
<span class="column-title">Donnée complète?</span>
</div>
<div class="column is-1 has-text-left">
<span class="column-title">Sessions</span>
......@@ -49,7 +49,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Latest Completion Date</span>
<span class="column-title">Dernière date d'exécution</span>
</span>
</div>
<div class="column is-1 has-text-left">
......@@ -62,7 +62,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Duration</span>
<span class="column-title">Durée</span>
</span> </div>
<div class="column is-1 has-text-left">
<span class="is-sortable">
......@@ -87,7 +87,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Errors?</span>
<span class="column-title">Erreurs?</span>
</span>
</div>
<div class="column is-1 has-text-left">
......@@ -143,4 +143,4 @@
<p class="bold-white">Reset</p>
</a>
</div>
</div>
\ No newline at end of file
</div>
src/app/components/logs-dashboard/report/logs-info/logs-info.component.html
+ 2
− 2
View file @ 73758e2b
......@@ -40,7 +40,7 @@
</svg>
</div>
<p [ngClass]="{'is-selected': displayedStep === oneStepData._id.step}">
<br> Erreur(s):
<br> Erreur(s):
{{ oneStepData.counts.ERROR ? oneStepData.counts.ERROR : 0}}
</div>
</div>
......@@ -79,4 +79,4 @@
<div>
</div>
</div>
</div>
\ No newline at end of file
</div>
src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.html
+ 12
− 12
View file @ 73758e2b
......@@ -5,7 +5,7 @@
<div class="section">
<div class="columns is-left is-marginless">
<div class="column has-text-left">
<span>{{nbObjects}} sessions(s) found for the slug </span>
<span>{{nbObjects}} sessions(s) trouvées pour ce slug </span>
<span class="bold-text">{{id}}</span>
<span class="italic-text"> : ( {{uuid}} ) </span>
</div>
......@@ -29,7 +29,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Nb of Slugs</span>
<span class="column-title">Nb de Slugs</span>
</span>
</div>
<div class="column is-2 has-text-left">
......@@ -42,7 +42,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Completion Date</span>
<span class="column-title">Date d'exécution</span>
</span>
</div>
<div class="column is-1 has-text-left">
......@@ -55,7 +55,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Duration</span>
<span class="column-title">Durée</span>
</span>
</div>
<div class="column is-1 has-text-left">
......@@ -81,7 +81,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Errors?</span>
<span class="column-title">Erreurs?</span>
</span>
</div>
<div class="column is-1 has-text-left">
......@@ -139,7 +139,7 @@
<div class="input-field is-centered">
<div class="columns is-5 is-vcentered">
<div class="column is-5 has-text-left">
<label class="label"> Search by slug: </label>
<label class="label"> Recherche par slug: </label>
<input class="input" type="text" [(ngModel)]="foundSlug" (keyup)="getAllInfoForOneSlug($event)" id="foundSlug" list="slugsList" />
<datalist id="slugsList">
<option *ngFor="let slug of completeSlugsList" [value]="slug"> {{slug}}</option>
......@@ -151,7 +151,7 @@
<div class="column has-text-left">
<div class="columns is-centered is-marginless">
<div class="column has-text-left">
<span>{{nbObjects}} slug(s) found for the session : </span>
<span>{{nbObjects}} slug(s) trouvés pour la session : </span>
<span class="bold-text">{{id}}</span>
</div>
</div>
......@@ -174,7 +174,7 @@
</span>
</div>
<div class="column is-1 has-text-left">
<span class="column-title">Full Data?</span>
<span class="column-title">Donnée complète?</span>
</div>
<div class="column is-1 has-text-left">
<span class="column-title">Sessions</span>
......@@ -189,7 +189,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Completion Date</span>
<span class="column-title">Date d'exécution</span>
</span>
</div>
<div class="column is-1 has-text-left">
......@@ -202,7 +202,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Duration (min)</span>
<span class="column-title">Durée</span>
</span> </div>
<div class="column is-1 has-text-left">
<span class="is-sortable">
......@@ -227,7 +227,7 @@
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Errors?</span>
<span class="column-title">Erreurs?</span>
</span>
</div>
<div class="column is-1 has-text-left">
......@@ -281,4 +281,4 @@
</div>
</div>
</div>
</div>
\ No newline at end of file
</div>
src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.ts
+ 1
− 1
View file @ 73758e2b
......@@ -145,7 +145,7 @@ export class LogsPreReportComponent implements OnInit {
}
}
getAllInfoForOneSlug() {
getAllInfoForOneSlug($event) {
if (this.foundSlug === '') {
this.getComplementaryInformation();
} else {
......
src/app/user/interceptors/auth-interceptor.ts
+ 1
− 1
View file @ 73758e2b
......@@ -13,7 +13,7 @@ export class AuthInterceptor implements HttpInterceptor {
let request = req;
// && req.url.includes('https://data-intothesky.alpha.grandlyon.com/authentication/api/logout'
if (xsrfToken) {
if (xsrfToken && !req.url.includes('indexerdb')) {
request = req.clone({
headers: req.headers.set('x-xsrf-token', xsrfToken),
});
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment