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

RED-5908: update common-ui & permissions mapping model

Browse Source
This commit is contained in:
Dan Percic 2023-01-09 11:17:28 +02:00
parent aeaf748c61
commit 341ec38841
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/red-ui/src/app/services/entity-permissions/entity-permissions.service.ts
View File

@ -17,14 +17,14 @@ export class EntityPermissionsService extends GenericService<IPermissionsMapping
loadConfigFor(targetObject: string): Observable<PermissionsMapping[]> { loadConfigFor(targetObject: string): Observable<PermissionsMapping[]> {
return this._http.get<IPermissionsMapping[]>(`/${this._defaultModelPath}/${targetObject}/mapping`).pipe( return this._http.get<IPermissionsMapping[]>(`/${this._defaultModelPath}/${targetObject}/mapping`).pipe(
mapEach(mapping => new PermissionsMapping(mapping, targetObject)), mapEach(mapping => new PermissionsMapping(mapping)),
tap(mappings => this.#permissionsConfigurationMapService.set(targetObject, mappings)), tap(mappings => this.#permissionsConfigurationMapService.set(targetObject, mappings)),
); );
} }
loadFor(targetObject: string): Observable<PermissionsMapping[]> { loadFor(targetObject: string): Observable<PermissionsMapping[]> {
return this._http.get<IPermissionsMapping[]>(`/${this._defaultModelPath}/${targetObject}`).pipe( return this._http.get<IPermissionsMapping[]>(`/${this._defaultModelPath}/${targetObject}`).pipe(
mapEach(mapping => new PermissionsMapping(mapping, targetObject)), mapEach(mapping => new PermissionsMapping(mapping)),
tap(mappings => { tap(mappings => {
this.#addMissingPermissions(mappings, targetObject); this.#addMissingPermissions(mappings, targetObject);
this.#permissionsMapService.set(targetObject, mappings); this.#permissionsMapService.set(targetObject, mappings);
@ -53,13 +53,10 @@ export class EntityPermissionsService extends GenericService<IPermissionsMapping
for (const mapping of configuration) { for (const mapping of configuration) {
const targetPermission: string = mapping.targetPermission.name; const targetPermission: string = mapping.targetPermission.name;
if (!mappings.some(p => p.targetPermission.name === targetPermission)) { if (!mappings.some(p => p.targetPermission.name === targetPermission)) {
const missingConfig: PermissionsMapping = new PermissionsMapping( const missingConfig: PermissionsMapping = new PermissionsMapping({
{ mappedPermissions: [],
mappedPermissions: [], targetPermission: mapping.targetPermission,
targetPermission: mapping.targetPermission, });
},
targetObject,
);
mappings.push(missingConfig); mappings.push(missingConfig);
} }
} }

2
apps/red-ui/src/app/services/files/files-map.service.ts
View File

@ -18,6 +18,6 @@ export class FilesMapService extends EntitiesMapService<IFile, File> {
file.reviewerName, file.reviewerName,
), ),
); );
this.replace(newFiles); this.replace(newFiles[0].dossierId, newFiles);
} }
} }

2
apps/red-ui/src/app/services/files/files.service.ts
View File

@ -38,7 +38,7 @@ export class FilesService extends EntitiesService<IFile, File> {
return super._getOne([dossierId, file.id]).pipe( return super._getOne([dossierId, file.id]).pipe(
map(_file => new File(_file, this._userService.getName(_file.assignee))), map(_file => new File(_file, this._userService.getName(_file.assignee))),
switchMap(_file => this._dossierStatsService.getFor([dossierId]).pipe(map(() => _file))), switchMap(_file => this._dossierStatsService.getFor([dossierId]).pipe(map(() => _file))),
map(_file => this._filesMapService.replace([_file])), map(_file => this._filesMapService.replace(dossierId, [_file])),
tap(() => this._logger.info('[FILE] Reloaded')), tap(() => this._logger.info('[FILE] Reloaded')),
); );
} }

2
libs/red-domain/src/lib/permissions/permissions-mapping.model.ts
View File

@ -10,7 +10,7 @@ export class PermissionsMapping extends Entity<IPermissionsMapping> implements I
readonly #currentValuesMap = new Map<string, boolean>(); readonly #currentValuesMap = new Map<string, boolean>();
constructor(permissionsMapping: IPermissionsMapping, readonly targetObject: string) { constructor(permissionsMapping: IPermissionsMapping) {
super(permissionsMapping); super(permissionsMapping);
this.mappedPermissions = permissionsMapping.mappedPermissions; this.mappedPermissions = permissionsMapping.mappedPermissions;
this.targetPermission = permissionsMapping.targetPermission; this.targetPermission = permissionsMapping.targetPermission;