@@ -11,12 +11,18 @@ import {
1111 ResourcesManagerService ,
1212 RichMember ,
1313 User ,
14+ UsersManagerService ,
1415} from '@perun-web-apps/perun/openapi' ;
1516import { MatDialog } from '@angular/material/dialog' ;
1617import { AttributesListComponent } from '@perun-web-apps/perun/components' ;
1718import { SelectionModel } from '@angular/cdk/collections' ;
1819import { DeleteAttributeDialogComponent } from '../dialogs/delete-attribute-dialog/delete-attribute-dialog.component' ;
19- import { getDefaultDialogConfig , getRecentlyVisitedIds } from '@perun-web-apps/perun/utils' ;
20+ import {
21+ compareFnName ,
22+ compareFnUser ,
23+ getDefaultDialogConfig ,
24+ getRecentlyVisitedIds ,
25+ } from '@perun-web-apps/perun/utils' ;
2026import { EditAttributeDialogComponent } from '@perun-web-apps/perun/dialogs' ;
2127import { CreateAttributeDialogComponent } from '../dialogs/create-attribute-dialog/create-attribute-dialog.component' ;
2228import { Urns } from '@perun-web-apps/perun/urns' ;
@@ -32,27 +38,31 @@ export class TwoEntityAttributePageComponent implements OnInit {
3238 @Input ( ) firstEntityId : number ;
3339 @Input ( ) firstEntity : string ;
3440 @Input ( ) secondEntity : string ;
41+ @Input ( ) specificSecondEntity : Resource | Facility | Group | RichMember | User = null ;
42+ @Input ( ) facilityId : number ;
3543 entityValues : Resource [ ] | Facility [ ] | Group [ ] | RichMember [ ] | User [ ] = [ ] ;
3644 attributes : Attribute [ ] = [ ] ;
3745 selection = new SelectionModel < Attribute > ( true , [ ] ) ;
38- specificSecondEntity : Resource | Facility | Group | RichMember | User ;
3946 allowedStatuses : string [ ] = [ 'INVALID' , 'VALID' ] ;
4047 loading = false ;
4148 innerLoading = false ;
4249 filterValue = '' ;
4350 filterEmpty = true ;
4451 noEntityMessage : string ;
52+ showSelect = true ;
4553
4654 constructor (
4755 private attributesManagerService : AttributesManagerService ,
4856 private resourcesManagerService : ResourcesManagerService ,
4957 private facilitiesManagerService : FacilitiesManagerService ,
5058 private groupsManagerService : GroupsManagerService ,
5159 private membersManager : MembersManagerService ,
60+ private usersManager : UsersManagerService ,
5261 private dialog : MatDialog
5362 ) { }
5463
5564 ngOnInit ( ) : void {
65+ this . showSelect = this . specificSecondEntity === null ;
5666 this . loadEntityValues ( ) ;
5767 this . setMessages ( this . secondEntity . toLowerCase ( ) ) ;
5868 }
@@ -113,13 +123,26 @@ export class TwoEntityAttributePageComponent implements OnInit {
113123 }
114124 break ;
115125 case 'user' :
116- this . facilitiesManagerService
117- . getAssignedFacilitiesByUser ( this . firstEntityId )
118- . subscribe ( ( facilities ) => {
119- this . entityValues = facilities ;
120- this . preselectEntity ( ) ;
121- this . loading = false ;
122- } ) ;
126+ switch ( this . secondEntity ) {
127+ case 'resource' :
128+ this . usersManager
129+ . getAssociatedResourcesForUser ( this . facilityId , this . firstEntityId )
130+ . subscribe ( ( resources ) => {
131+ this . entityValues = resources ;
132+ this . preselectEntity ( ) ;
133+ this . loading = false ;
134+ } ) ;
135+ break ;
136+ default :
137+ this . facilitiesManagerService
138+ . getAssignedFacilitiesByUser ( this . firstEntityId )
139+ . subscribe ( ( facilities ) => {
140+ this . entityValues = facilities ;
141+ this . preselectEntity ( ) ;
142+ this . loading = false ;
143+ } ) ;
144+ break ;
145+ }
123146 break ;
124147 case 'resource' :
125148 switch ( this . secondEntity ) {
@@ -158,13 +181,18 @@ export class TwoEntityAttributePageComponent implements OnInit {
158181 }
159182
160183 preselectEntity ( ) : void {
161- if ( this . entityValues . length !== 0 ) {
184+ if ( this . specificSecondEntity !== null ) {
185+ this . specifySecondEntity ( this . specificSecondEntity ) ;
186+ } else if ( this . entityValues . length !== 0 ) {
162187 this . findInitiallySelectedEntity ( ) ;
163188 }
164189 }
165190
166191 findInitiallySelectedEntity ( ) : void {
167- let initialEntity = this . entityValues [ 0 ] ;
192+ let initialEntity =
193+ this . secondEntity === 'member' || this . secondEntity === 'user'
194+ ? this . entityValues . sort ( compareFnUser ) [ 0 ]
195+ : this . entityValues . sort ( compareFnName ) [ 0 ] ;
168196 const recentIds = getRecentlyVisitedIds ( this . entityKey ( ) ) ;
169197 if ( recentIds ) {
170198 for ( const entity of this . entityValues ) {
@@ -231,12 +259,28 @@ export class TwoEntityAttributePageComponent implements OnInit {
231259 }
232260 break ;
233261 case 'user' :
234- this . attributesManagerService
235- . getUserFacilityAttributes ( this . firstEntityId , entityId )
236- . subscribe ( ( attributes ) => {
237- this . attributes = attributes ;
238- this . innerLoading = false ;
239- } ) ;
262+ switch ( this . secondEntity ) {
263+ case 'resource' :
264+ this . membersManager
265+ . getMemberByUser ( ( this . specificSecondEntity as Resource ) . voId , this . firstEntityId )
266+ . subscribe ( ( member ) => {
267+ this . attributesManagerService
268+ . getMemberResourceAttributes ( member . id , entityId )
269+ . subscribe ( ( attributes ) => {
270+ this . attributes = attributes ;
271+ this . innerLoading = false ;
272+ } ) ;
273+ } ) ;
274+ break ;
275+ default :
276+ this . attributesManagerService
277+ . getUserFacilityAttributes ( this . firstEntityId , entityId )
278+ . subscribe ( ( attributes ) => {
279+ this . attributes = attributes ;
280+ this . innerLoading = false ;
281+ } ) ;
282+ break ;
283+ }
240284 break ;
241285 case 'resource' :
242286 switch ( this . secondEntity ) {
0 commit comments