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

RED-2873: File attributes order

Browse Source
This commit is contained in:
Adina Țeudan 2021-11-25 14:58:33 +02:00
parent 7d725b4986
commit 2243225ee7
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/red-ui/src/app/services/entity-services/file-attributes.service.ts
View File

@ -1,7 +1,7 @@
import { EntitiesService, List, RequiredParam, Validate } from '@iqser/common-ui';
import { Injectable, Injector } from '@angular/core';
import { BehaviorSubject, Observable, of } from 'rxjs';
import { catchError, map, tap } from 'rxjs/operators';
import { catchError, tap } from 'rxjs/operators';
import { FileAttributeConfig, FileAttributes, IFileAttributeConfig, IFileAttributesConfig } from '@red/domain';
type FileAttributesConfigMap = Readonly<Record<string, IFileAttributesConfig>>;
@ -24,13 +24,10 @@ export class FileAttributesService extends EntitiesService<FileAttributeConfig,
* Get the file attributes that can be used at importing csv.
*/
@Validate()
getFileAttributesConfig(@RequiredParam() dossierTemplateId: string, fetch = true): Observable<IFileAttributesConfig> {
if (!fetch) {
return this._fileAttributesConfig$.pipe(map(entities => entities[dossierTemplateId]));
}
getFileAttributesConfig(@RequiredParam() dossierTemplateId: string): Observable<IFileAttributesConfig> {
const request$ = this._getOne<IFileAttributesConfig>(['config', dossierTemplateId]);
return request$.pipe(
tap(entities => entities.fileAttributeConfigs.sort((c1, c2) => c1.placeholder.localeCompare(c2.placeholder))),
tap(entities =>
this._fileAttributesConfig$.next({
...this._fileAttributesConfig$.value,
@ -42,9 +39,7 @@ export class FileAttributesService extends EntitiesService<FileAttributeConfig,
}
getFileAttributeConfig(dossierTemplateId: string): IFileAttributesConfig | undefined {
const fileAttributesConfig = this._fileAttributesConfig$.value[dossierTemplateId];
fileAttributesConfig.fileAttributeConfigs.sort((c1, c2) => c1.placeholder.localeCompare(c2.placeholder));
return fileAttributesConfig;
return this._fileAttributesConfig$.value[dossierTemplateId];
}
/**