Skip to content

Commit 44b2602

Browse files
authored
Merge pull request #47 from sourcefuse/saas-ui-11
fix(arc-saas): tested changes of Tenant hyperlink
2 parents cd658ea + 11313f0 commit 44b2602

File tree

3 files changed

+23
-16
lines changed

3 files changed

+23
-16
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@use '../../styles/grid-styles.scss' as *;
22

33
.ag-theme-quartz {
4-
width: 100%;
5-
height: 400;
6-
}
4+
width: 100%;
5+
height: 400;
6+
}

projects/saas-ui/src/app/main/components/onboarding-tenant-list/onboarding-tenant-list.component.ts

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, OnInit} from '@angular/core';
1+
import {Component, Inject, OnInit} from '@angular/core';
22
import {ActivatedRoute} from '@angular/router';
33
import {RouteComponentBaseDirective} from '@project-lib/core/route-component-base';
44
import {ColDef} from 'ag-grid-community';
@@ -9,6 +9,8 @@ import {Tenant} from '../../../shared/models';
99
import {BackendFilter} from '@project-lib/core/api';
1010
import {TenantStatus} from '../../../shared/enum/tenant-status.enum';
1111
import {environment} from 'projects/saas-ui/src/environment';
12+
import {APP_CONFIG} from '@project-lib/app-config';
13+
import {IAnyObject} from '@project-lib/core/i-any-object';
1214

1315
@Component({
1416
selector: 'app-onboarding-tenant-list',
@@ -27,6 +29,15 @@ export class OnboardingTenantListComponent
2729
resizable: true,
2830
};
2931

32+
constructor(
33+
protected override readonly location: Location,
34+
protected override readonly route: ActivatedRoute,
35+
private readonly tenantFacade: TenantFacadeService,
36+
@Inject(APP_CONFIG) private readonly appConfig: IAnyObject,
37+
) {
38+
super(route, location);
39+
}
40+
3041
colDefs: ColDef[] = [
3142
{
3243
field: 'name',
@@ -35,10 +46,13 @@ export class OnboardingTenantListComponent
3546
minWidth: 20,
3647
filter: 'agTextColumnFilter',
3748
floatingFilter: true,
49+
sortable: true,
3850
cellRenderer: function (params) {
39-
console.log(params);
40-
console.log(params.data.key);
41-
return `<a href="${params.data.key}.${environment.baseApiUrl}" target="_blank" class="company-link">
51+
const url = this.appConfig.baseApiUrl.replace(
52+
'//',
53+
`//${params.data.key}.`,
54+
);
55+
return `<a href="${url}" target="_blank" class="company-link">
4256
${params.value}
4357
</a>`;
4458
},
@@ -73,13 +87,6 @@ export class OnboardingTenantListComponent
7387
include: [{relation: 'address'}],
7488
};
7589
variable: any;
76-
constructor(
77-
protected override readonly location: Location,
78-
protected override readonly route: ActivatedRoute,
79-
private readonly tenantFacade: TenantFacadeService,
80-
) {
81-
super(route, location);
82-
}
8390

8491
ngOnInit(): void {
8592
this.getOnBoardingTenants();

projects/saas-ui/src/app/main/main.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
width: 100%;
1414
}
1515

16-
.column-wrapper{
17-
height:calc(100% - 200px);
16+
.column-wrapper {
17+
height: calc(100% - 200px);
1818
}
1919
.logo-container {
2020
display: flex;

0 commit comments

Comments
 (0)