Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-3645: Tooltips no longer visible when hovering on tooltip

Browse Source
This commit is contained in:
Adina Țeudan 2022-03-18 15:27:58 +02:00
parent 6cd3450fdb
commit 5c417fdde3
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/red-ui/src/app/app.module.ts
View File

@ -47,6 +47,7 @@ import { UserService } from '@services/user.service';
import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service';
import { FeaturesService } from '@services/features.service';
import { MAT_TOOLTIP_DEFAULT_OPTIONS } from '@angular/material/tooltip';
export function httpLoaderFactory(httpClient: HttpClient, configService: ConfigService): PruningTranslationLoader {
return new PruningTranslationLoader(httpClient, '/assets/i18n/', `.json?version=${configService.values.FRONTEND_APP_VERSION}`);
@ -164,6 +165,12 @@ const components = [AppComponent, AuthErrorComponent, NotificationsComponent, Sp
provide: ARCHIVED_DOSSIERS_SERVICE,
useExisting: ArchivedDossiersService,
},
{
provide: MAT_TOOLTIP_DEFAULT_OPTIONS,
useValue: {
disableTooltipInteractivity: true,
},
},
DatePipe,
],
bootstrap: [AppComponent],

4
apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
View File

@ -1,6 +1,6 @@
import { ApplicationRef, Injectable, Injector, OnDestroy } from '@angular/core';
import { FileUploadModel } from '../model/file-upload.model';
import { HttpErrorResponse, HttpEventType } from '@angular/common/http';
import { HttpErrorResponse, HttpEventType, HttpStatusCode } from '@angular/common/http';
import { interval, Subject, Subscription } from 'rxjs';
import { ConfigService } from '@services/config.service';
import { TranslateService } from '@ngx-translate/core';
@ -211,7 +211,7 @@ export class FileUploadService extends GenericService<IFileUploadResult> impleme
message: this._errorMessageService.getMessage(err, 'upload-status.error.generic'),
};
this._removeUpload(uploadFile);
if (uploadFile.retryCount < 5 && err.status !== 400) {
if (uploadFile.retryCount < 5 && ![HttpStatusCode.BadRequest, HttpStatusCode.Conflict].includes(err.status)) {
uploadFile.retryCount += 1;
this.scheduleUpload(uploadFile);
}

2
apps/red-ui/src/assets/i18n/de.json
View File

@ -1860,7 +1860,7 @@
},
"error": {
"file-size": "Datei zu groß. Die maximal zulässige Größe beträgt {size} MB.",
"generic": "Fehler beim Hochladen des Dokuments"
"generic": "Fehler beim Hochladen des Dokuments. {error}"
}
},
"user-listing": {

2
apps/red-ui/src/assets/i18n/en.json
View File

@ -1860,7 +1860,7 @@
},
"error": {
"file-size": "File too large. Limit is {size}MB.",
"generic": "Failed to upload file. "
"generic": "Failed to upload file. {error}"
}
},
"user-listing": {