Refactor subject resolver to use SubjectService; add tenant resolver for tenant data retrieval
This commit is contained in:
parent
081ab589f3
commit
4d2ad1034d
@ -1,15 +1,15 @@
|
|||||||
import {ResolveFn} from '@angular/router';
|
import {ResolveFn} from '@angular/router';
|
||||||
import {inject} from '@angular/core';
|
import {inject} from '@angular/core';
|
||||||
import {ProxyService} from '../clients/gandalf/mithrandir/proxy.service';
|
|
||||||
import {map} from 'rxjs';
|
import {map} from 'rxjs';
|
||||||
|
import {SubjectService} from '../clients/gandalf/mithrandir/subject.service';
|
||||||
|
|
||||||
export const subjectResolver: ResolveFn<string> = (route, state) => {
|
export const subjectResolver: ResolveFn<string> = (route, state) => {
|
||||||
const proxyService = inject(ProxyService);
|
const subjectService = inject(SubjectService);
|
||||||
return proxyService.me$().pipe(
|
return subjectService.me$().pipe(
|
||||||
map(x => {
|
map(x => {
|
||||||
console.log(x);
|
|
||||||
return x.name;
|
return x.name;
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
21
src/angular/frontend/src/app/resolvers/tenantResolver.ts
Normal file
21
src/angular/frontend/src/app/resolvers/tenantResolver.ts
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
import {ResolveFn} from "@angular/router";
|
||||||
|
import {TenantGridViewDto} from "../clients/gandalf/mithrandir/tenant/dtos/tenant-grid-view-dto";
|
||||||
|
import {inject} from "@angular/core";
|
||||||
|
import {TenantService} from "../clients/gandalf/mithrandir/tenant/tenant.service";
|
||||||
|
import {map} from 'rxjs';
|
||||||
|
|
||||||
|
export const tenantResolver: ResolveFn<TenantGridViewDto | null> = (route, state) => {
|
||||||
|
const tenantService = inject(TenantService);
|
||||||
|
|
||||||
|
const id = route.paramMap.get('id')
|
||||||
|
|
||||||
|
return tenantService.getTenant$(id);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const tenantNameResolver: ResolveFn<string> = (route, state) => {
|
||||||
|
const tenantService = inject(TenantService);
|
||||||
|
|
||||||
|
const id = route.paramMap.get('id')
|
||||||
|
|
||||||
|
return tenantService.getTenant$(id).pipe(map(tenant => tenant?.name ?? 'Unnamed Tenant'));
|
||||||
|
};
|
||||||
Loading…
x
Reference in New Issue
Block a user