diff --git a/src/app/modules/devices/device-instances/device-instances.component.ts b/src/app/modules/devices/device-instances/device-instances.component.ts index f6ea37b9..c6e3d415 100644 --- a/src/app/modules/devices/device-instances/device-instances.component.ts +++ b/src/app/modules/devices/device-instances/device-instances.component.ts @@ -250,19 +250,7 @@ export class DeviceInstancesComponent implements OnInit, AfterViewInit { }), //handle results map((deviceInstancesWithTotal: DeviceInstancesTotalModel) => { - let missingCreators: string[] = []; - deviceInstancesWithTotal?.result?.forEach(device => { - if(device.shared && device.creator && !this.userIdToName[device.creator] && !missingCreators.includes(device.creator)) { - missingCreators.push(device.creator); - } - }) - missingCreators.forEach(creator => { - this.permissionsService.getUserById(creator).subscribe(value => { - if(value) { - this.userIdToName[value.id] = value.username; - } - }) - }) + this.loadUserNames(deviceInstancesWithTotal.result); this.setDevicesAndTotal(deviceInstancesWithTotal); return deviceInstancesWithTotal; }), @@ -275,6 +263,22 @@ export class DeviceInstancesComponent implements OnInit, AfterViewInit { } } + private loadUserNames(elements: {creator: string, shared: boolean}[]) { + let missingCreators: string[] = []; + elements?.forEach(element => { + if(element.shared && element.creator && !this.userIdToName[element.creator] && !missingCreators.includes(element.creator)) { + missingCreators.push(element.creator); + } + }) + missingCreators.forEach(creator => { + this.permissionsService.getUserById(creator).subscribe(value => { + if(value) { + this.userIdToName[value.id] = value.username; + } + }) + }) + } + private setDevicesAndTotal(result: DeviceInstancesTotalModel) { this.dataSource.data = result.result; this.totalCount = result.total; diff --git a/src/app/modules/devices/networks/networks.component.ts b/src/app/modules/devices/networks/networks.component.ts index dd9b8ed3..b6c79281 100644 --- a/src/app/modules/devices/networks/networks.component.ts +++ b/src/app/modules/devices/networks/networks.component.ts @@ -182,26 +182,29 @@ export class NetworksComponent implements OnInit, OnDestroy { .searchNetworks(this.searchText, this.pageSize, this.offset, this.sortBy, this.sortDirection) .pipe( map((networks: NetworksPermModel[]) => { - let missingCreators: string[] = []; - networks?.forEach(network => { - if(network.shared && network.creator && !this.userIdToName[network.creator] && !missingCreators.includes(network.creator)) { - missingCreators.push(network.creator); - } - }) - missingCreators.forEach(creator => { - this.permissionsService.getUserById(creator).subscribe(value => { - if(value) { - this.userIdToName[value.id] = value.username; - } - }) - }) - + this.loadUserNames(networks); this.dataSource.data = networks; return networks; }) ); } + private loadUserNames(elements: {creator: string, shared: boolean}[]) { + let missingCreators: string[] = []; + elements?.forEach(element => { + if(element.shared && element.creator && !this.userIdToName[element.creator] && !missingCreators.includes(element.creator)) { + missingCreators.push(element.creator); + } + }) + missingCreators.forEach(creator => { + this.permissionsService.getUserById(creator).subscribe(value => { + if(value) { + this.userIdToName[value.id] = value.username; + } + }) + }) + } + reload() { this.offset = 0; this.pageSize = 20; diff --git a/src/app/modules/processes/process-repo/process-repo.component.html b/src/app/modules/processes/process-repo/process-repo.component.html index 68edb45b..bb00f254 100644 --- a/src/app/modules/processes/process-repo/process-repo.component.html +++ b/src/app/modules/processes/process-repo/process-repo.component.html @@ -52,7 +52,7 @@
- share
diff --git a/src/app/modules/processes/process-repo/process-repo.component.ts b/src/app/modules/processes/process-repo/process-repo.component.ts index c9b1079f..6433908a 100644 --- a/src/app/modules/processes/process-repo/process-repo.component.ts +++ b/src/app/modules/processes/process-repo/process-repo.component.ts @@ -20,7 +20,7 @@ import { SortModel } from '../../../core/components/sort/shared/sort.model'; import { forkJoin, Observable, Subscription } from 'rxjs'; import { SearchbarService } from '../../../core/components/searchbar/shared/searchbar.service'; import { ResponsiveService } from '../../../core/services/responsive.service'; -import { ProcessModel } from './shared/process.model'; +import {ProcessModel, ProcessPermModel} from './shared/process.model'; import { ProcessRepoService } from './shared/process-repo.service'; import { UtilService } from '../../../core/services/util.service'; import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; @@ -32,6 +32,7 @@ import { MatSnackBar } from '@angular/material/snack-bar'; import { ProcessRepoConditionModel, ProcessRepoConditionsModel } from './shared/process-repo-conditions.model'; import { Router } from '@angular/router'; import { FormArray, FormBuilder, FormGroup } from '@angular/forms'; +import {PermissionsService} from "../../permissions/shared/permissions.service"; const grids = new Map([ ['xs', 1], @@ -74,6 +75,8 @@ export class ProcessRepoComponent implements OnInit, AfterViewInit, OnDestroy { private gridColChangeTimeout: number | undefined; private knownMainPanelOffsetHeight = 0; + userIdToName: {[key: string]: string} = {}; + @ViewChild('mainPanel', { static: false }) mainPanel!: ElementRef; constructor( @@ -89,6 +92,7 @@ export class ProcessRepoComponent implements OnInit, AfterViewInit, OnDestroy { private snackBar: MatSnackBar, private router: Router, private _formBuilder: FormBuilder, + private permissionsService: PermissionsService, ) { const sub = this.authorizationService.getUserId(); if (typeof sub === 'string') { @@ -290,7 +294,8 @@ export class ProcessRepoComponent implements OnInit, AfterViewInit, OnDestroy { this.sortAttribute.order, this.getConditions(), ) - .subscribe((repoItems: ProcessModel[]) => { + .subscribe((repoItems: ProcessPermModel[]) => { + this.loadUserNames(repoItems); this.animationDone = true; this.addToFormArray(repoItems); if (repoItems.length !== this.limit) { @@ -300,8 +305,24 @@ export class ProcessRepoComponent implements OnInit, AfterViewInit, OnDestroy { }); } - private addToFormArray(repoItems: ProcessModel[]): void { - repoItems.forEach((repoItem: ProcessModel) => { + private loadUserNames(elements: {creator: string, shared: boolean}[]) { + let missingCreators: string[] = []; + elements?.forEach(element => { + if(element.shared && element.creator && !this.userIdToName[element.creator] && !missingCreators.includes(element.creator)) { + missingCreators.push(element.creator); + } + }) + missingCreators.forEach(creator => { + this.permissionsService.getUserById(creator).subscribe(value => { + if(value) { + this.userIdToName[value.id] = value.username; + } + }) + }) + } + + private addToFormArray(repoItems: ProcessPermModel[]): void { + repoItems.forEach((repoItem: ProcessPermModel) => { this.repoItems.push( this._formBuilder.group({ id: repoItem.id, @@ -311,6 +332,7 @@ export class ProcessRepoComponent implements OnInit, AfterViewInit, OnDestroy { bpmn_xml: repoItem.bpmn_xml, publish: repoItem.publish, shared: repoItem.shared, + creator: repoItem.creator, parent_id: repoItem.parent_id, image: this.provideImg(repoItem.svgXML), permissions: repoItem.permissions, diff --git a/src/app/modules/processes/process-repo/shared/process-repo.service.ts b/src/app/modules/processes/process-repo/shared/process-repo.service.ts index c52fe59b..51c3f2a4 100644 --- a/src/app/modules/processes/process-repo/shared/process-repo.service.ts +++ b/src/app/modules/processes/process-repo/shared/process-repo.service.ts @@ -20,7 +20,7 @@ import { ErrorHandlerService } from '../../../../core/services/error-handler.ser import { environment } from '../../../../../environments/environment'; import { catchError, map, mergeMap, retryWhen } from 'rxjs/operators'; import { Observable, timer } from 'rxjs'; -import { ProcessModel } from './process.model'; +import {ProcessModel, ProcessPermModel} from './process.model'; import { DesignerProcessModel } from '../../designer/shared/designer.model'; import { ProcessRepoConditionsModel } from './process-repo-conditions.model'; import { DeviceTypeBaseModel } from '../../../metadata/device-types-overview/shared/device-type.model'; @@ -56,9 +56,9 @@ export class ProcessRepoService { feature: string, order: string, conditions: ProcessRepoConditionsModel | null, - ): Observable { + ): Observable { return this.http - .post(environment.permissionSearchUrl + '/v3/query/processmodel', { + .post(environment.permissionSearchUrl + '/v3/query/processmodel', { resource: 'processmodel', find: { search: query, diff --git a/src/app/modules/processes/process-repo/shared/process.model.ts b/src/app/modules/processes/process-repo/shared/process.model.ts index 46812189..8742c108 100644 --- a/src/app/modules/processes/process-repo/shared/process.model.ts +++ b/src/app/modules/processes/process-repo/shared/process.model.ts @@ -34,3 +34,7 @@ export interface ProcessModel { }; selected: boolean; } + +export interface ProcessPermModel extends ProcessModel { + creator: string; +} \ No newline at end of file