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

RED-6536 - Related download options no longer grouped together

Browse Source
This commit is contained in:
Valentin Mihai 2023-04-19 19:02:19 +03:00
parent 941f137597
commit d1df30a2b4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.ts
View File

@ -37,7 +37,7 @@ export class AddDossierDialogComponent extends BaseDialogComponent implements On
(this.permissionsService.has(ROLES.getRss) && !['DELTA_PREVIEW', 'REDACTED'].includes(element.key)),
);
dossierTemplates: IDossierTemplate[];
availableReportTypes = [];
availableReportTypes: IReportTemplate[] = [];
dossierTemplateId: string;
constructor(

6
apps/red-ui/src/app/modules/shared/dialogs/download-dialog/download-dialog.component.ts
View File

@ -63,7 +63,7 @@ export class DownloadDialogComponent extends BaseDialogComponent {
private get _availableReportTypes() {
const dossierTemplateId = this.data.dossier.dossierTemplateId;
const result = this._reportTemplateController.getAvailableReportTemplates(dossierTemplateId);
return result.then(values => this._sortAvailableReportTypes(values) ?? []);
return result.then(values => values ?? []);
}
private get _formDownloadTypes() {
@ -131,8 +131,4 @@ export class DownloadDialogComponent extends BaseDialogComponent {
const isHexColor = /^#[0-9A-F]{6}$/i.test(color);
return isHexColor ? null : { redactionPreviewColor: true };
}
private _sortAvailableReportTypes(values) {
return values.sort((a, b) => (a.fileName > b.fileName ? 1 : b.fileName > a.fileName ? -1 : 0));
}
}

8
apps/red-ui/src/app/services/report-template.service.ts
View File

@ -3,7 +3,7 @@ import { GenericService, HeadersConfiguration, RequiredParam, Validate } from '@
import { IPlaceholdersResponse, IReportTemplate } from '@red/domain';
import { firstValueFrom, Observable, of } from 'rxjs';
import { HttpResponse } from '@angular/common/http';
import { catchError } from 'rxjs/operators';
import { catchError, map } from 'rxjs/operators';
@Injectable({
providedIn: 'root',
@ -35,7 +35,7 @@ export class ReportTemplateService extends GenericService<unknown> {
@Validate()
getAvailableReportTemplates(@RequiredParam() dossierTemplateId: string) {
const request = this.getAll<IReportTemplate[]>(`${this._defaultModelPath}/${dossierTemplateId}`);
return firstValueFrom(request);
return firstValueFrom(request.pipe(map(templates => this._sortAvailableReportTypes(templates))));
}
@Validate()
@ -62,4 +62,8 @@ export class ReportTemplateService extends GenericService<unknown> {
headers: HeadersConfiguration.getHeaders({ contentType: false }),
});
}
private _sortAvailableReportTypes(values): IReportTemplate[] {
return values.sort((a, b) => (a.fileName > b.fileName ? 1 : b.fileName > a.fileName ? -1 : 0));
}
}