Skip to content

Commit 7b0b7ef

Browse files
authored
Merge pull request #479 from aspnetboilerplate/netcore3.0
upgrade to aspnetcore 3.0. Approved by @ismcagdas.
2 parents 802e575 + a974846 commit 7b0b7ef

File tree

36 files changed

+692
-645
lines changed

36 files changed

+692
-645
lines changed

angular/src/app/roles/create-role/create-role-dialog.component.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import { AppComponentBase } from '@shared/app-component-base';
66
import {
77
RoleServiceProxy,
88
RoleDto,
9-
ListResultDtoOfPermissionDto,
9+
1010
PermissionDto,
11-
CreateRoleDto
11+
CreateRoleDto,
12+
PermissionDtoListResultDto
1213
} from '@shared/service-proxies/service-proxies';
1314

1415
@Component({
@@ -44,7 +45,7 @@ export class CreateRoleDialogComponent extends AppComponentBase
4445
ngOnInit(): void {
4546
this._roleService
4647
.getAllPermissions()
47-
.subscribe((result: ListResultDtoOfPermissionDto) => {
48+
.subscribe((result: PermissionDtoListResultDto) => {
4849
this.permissions = result.items;
4950
this.setInitialPermissionsStatus();
5051
});
@@ -70,7 +71,7 @@ export class CreateRoleDialogComponent extends AppComponentBase
7071

7172
getCheckedPermissions(): string[] {
7273
const permissions: string[] = [];
73-
_.forEach(this.checkedPermissionsMap, function(value, key) {
74+
_.forEach(this.checkedPermissionsMap, function (value, key) {
7475
if (value) {
7576
permissions.push(key);
7677
}

angular/src/app/roles/roles.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
import {
1010
RoleServiceProxy,
1111
RoleDto,
12-
PagedResultDtoOfRoleDto
12+
RoleDtoPagedResultDto
1313
} from '@shared/service-proxies/service-proxies';
1414
import { CreateRoleDialogComponent } from './create-role/create-role-dialog.component';
1515
import { EditRoleDialogComponent } from './edit-role/edit-role-dialog.component';
@@ -57,7 +57,7 @@ export class RolesComponent extends PagedListingComponentBase<RoleDto> {
5757
finishedCallback();
5858
})
5959
)
60-
.subscribe((result: PagedResultDtoOfRoleDto) => {
60+
.subscribe((result: RoleDtoPagedResultDto) => {
6161
this.roles = result.items;
6262
this.showPaging(result, pageNumber);
6363
});

angular/src/app/tenants/tenants.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import {
99
import {
1010
TenantServiceProxy,
1111
TenantDto,
12-
PagedResultDtoOfTenantDto
13-
} from '@shared/service-proxies/service-proxies';
12+
TenantDtoPagedResultDto} from '@shared/service-proxies/service-proxies';
1413
import { CreateTenantDialogComponent } from './create-tenant/create-tenant-dialog.component';
1514
import { EditTenantDialogComponent } from './edit-tenant/edit-tenant-dialog.component';
1615

@@ -59,7 +58,7 @@ export class TenantsComponent extends PagedListingComponentBase<TenantDto> {
5958
finishedCallback();
6059
})
6160
)
62-
.subscribe((result: PagedResultDtoOfTenantDto) => {
61+
.subscribe((result: TenantDtoPagedResultDto) => {
6362
this.tenants = result.items;
6463
this.showPaging(result, pageNumber);
6564
});

angular/src/app/users/users.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material';
33
import { finalize } from 'rxjs/operators';
44
import { appModuleAnimation } from '@shared/animations/routerTransition';
55
import { PagedListingComponentBase, PagedRequestDto } from 'shared/paged-listing-component-base';
6-
import { UserServiceProxy, UserDto, PagedResultDtoOfUserDto } from '@shared/service-proxies/service-proxies';
6+
import { UserServiceProxy, UserDto, UserDtoPagedResultDto } from '@shared/service-proxies/service-proxies';
77
import { CreateUserDialogComponent } from './create-user/create-user-dialog.component';
88
import { EditUserDialogComponent } from './edit-user/edit-user-dialog.component';
99
import { Moment } from 'moment';
@@ -23,7 +23,7 @@ class PagedUsersRequestDto extends PagedRequestDto {
2323
padding: 10px;
2424
}
2525
`
26-
]
26+
]
2727
})
2828
export class UsersComponent extends PagedListingComponentBase<UserDto> {
2929
users: UserDto[] = [];
@@ -66,7 +66,7 @@ export class UsersComponent extends PagedListingComponentBase<UserDto> {
6666
finishedCallback();
6767
})
6868
)
69-
.subscribe((result: PagedResultDtoOfUserDto) => {
69+
.subscribe((result: UserDtoPagedResultDto) => {
7070
this.users = result.items;
7171
this.showPaging(result, pageNumber);
7272
});

angular/src/shared/AppEnums.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { IsTenantAvailableOutputState } from '@shared/service-proxies/service-proxies';
1+
import { TenantAvailabilityState } from '@shared/service-proxies/service-proxies';
22

33

44
export class AppTenantAvailabilityState {
5-
static Available: number = IsTenantAvailableOutputState._1;
6-
static InActive: number = IsTenantAvailableOutputState._2;
7-
static NotFound: number = IsTenantAvailableOutputState._3;
5+
static Available: number = TenantAvailabilityState._1;
6+
static InActive: number = TenantAvailabilityState._2;
7+
static NotFound: number = TenantAvailabilityState._3;
88
}

0 commit comments

Comments
 (0)