Merge branch 'master' of https://github.com/aspnetboilerplate/module-zero-core-template

Author: AllyMurray

angular/src/app/layout/sidebar-user-area.component.html

@@ -8,7 +8,7 @@
         <div class="btn-group user-helper-dropdown">
             <i class="material-icons" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">keyboard_arrow_down</i>
             <ul class="dropdown-menu pull-right">
-                <li><a [routerLink]="['/app/update-password']"><i class="material-icons">lock</i>Update Password</a></li>
+                <li><a [routerLink]="['/app/update-password']"><i class="material-icons">lock</i>{{ 'UpdatePassword' | localize }}</a></li>
                 <li><a (click)="logout()"><i class="material-icons">input</i>{{ 'Logout' | localize }}</a></li>
             </ul>
         </div>

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

@@ -6,9 +6,10 @@ import { AppComponentBase } from '@shared/app-component-base';
 import {
   RoleServiceProxy,
   RoleDto,
-  ListResultDtoOfPermissionDto,
+
   PermissionDto,
-  CreateRoleDto
+  CreateRoleDto,
+  PermissionDtoListResultDto
 } from '@shared/service-proxies/service-proxies';
 
 @Component({
@@ -44,7 +45,7 @@ export class CreateRoleDialogComponent extends AppComponentBase
   ngOnInit(): void {
     this._roleService
       .getAllPermissions()
-      .subscribe((result: ListResultDtoOfPermissionDto) => {
+      .subscribe((result: PermissionDtoListResultDto) => {
         this.permissions = result.items;
         this.setInitialPermissionsStatus();
       });
@@ -70,7 +71,7 @@ export class CreateRoleDialogComponent extends AppComponentBase
 
   getCheckedPermissions(): string[] {
     const permissions: string[] = [];
-    _.forEach(this.checkedPermissionsMap, function(value, key) {
+    _.forEach(this.checkedPermissionsMap, function (value, key) {
       if (value) {
         permissions.push(key);
       }

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

@@ -9,7 +9,7 @@ import {
 import {
     RoleServiceProxy,
     RoleDto,
-    PagedResultDtoOfRoleDto
+    RoleDtoPagedResultDto
 } from '@shared/service-proxies/service-proxies';
 import { CreateRoleDialogComponent } from './create-role/create-role-dialog.component';
 import { EditRoleDialogComponent } from './edit-role/edit-role-dialog.component';
@@ -57,7 +57,7 @@ export class RolesComponent extends PagedListingComponentBase<RoleDto> {
                     finishedCallback();
                 })
             )
-            .subscribe((result: PagedResultDtoOfRoleDto) => {
+            .subscribe((result: RoleDtoPagedResultDto) => {
                 this.roles = result.items;
                 this.showPaging(result, pageNumber);
             });

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

@@ -9,8 +9,7 @@ import {
 import {
     TenantServiceProxy,
     TenantDto,
-    PagedResultDtoOfTenantDto
-} from '@shared/service-proxies/service-proxies';
+    TenantDtoPagedResultDto} from '@shared/service-proxies/service-proxies';
 import { CreateTenantDialogComponent } from './create-tenant/create-tenant-dialog.component';
 import { EditTenantDialogComponent } from './edit-tenant/edit-tenant-dialog.component';
 
@@ -59,7 +58,7 @@ export class TenantsComponent extends PagedListingComponentBase<TenantDto> {
                     finishedCallback();
                 })
             )
-            .subscribe((result: PagedResultDtoOfTenantDto) => {
+            .subscribe((result: TenantDtoPagedResultDto) => {
                 this.tenants = result.items;
                 this.showPaging(result, pageNumber);
             });

angular/src/app/users/change-password/change-password.component.html

@@ -11,7 +11,7 @@ <h2>{{ "UpdatePassword" | localize }}</h2>
                             <div class="col-md-6">
                                 <mat-form-field>
                                     <input matInput id="currentPassword" type="password" name="CurrentPassword" formControlName="currentPassword"
-                                        [placeholder]="'Current Password' | localize"
+                                        [placeholder]="'CurrentPassword' | localize"
                                         required minlength="2" maxlength="32"
                                         />
                                 </mat-form-field>
@@ -21,11 +21,11 @@ <h2>{{ "UpdatePassword" | localize }}</h2>
                             <div class="col-md-6" [formGroup]="passwordsFormGroup" formGroupName="passwords">
                                 <mat-form-field>
                                     <input matInput id="newPassword" formControlName="newPassword" type="password" name="NewPassword" 
-                                        [placeholder]="'New Password' | localize"
+                                        [placeholder]="'NewPassword' | localize"
                                         required minlength="2" maxlength="32"
                                         />
                                     <mat-error *ngIf="passwordsFormGroup.controls.newPassword.errors">
-                                        Passwords must be at least 8 characters, contain a lowercase, uppercase, and number
+                                        {{ "PasswordsMustBeAtLeast8CharactersContainLowercaseUppercaseNumber" | localize }}
                                     </mat-error>
                                 </mat-form-field>
                             </div>
@@ -34,14 +34,14 @@ <h2>{{ "UpdatePassword" | localize }}</h2>
                             <div class="col-md-6" formGroupName="passwords">
                                 <mat-form-field>
                                     <input matInput id="repeatNewPassword" formControlName="repeatNewPassword" type="password" name="RepeatNewPassword" 
-                                        [placeholder]="'Confirm New Password' | localize" [errorStateMatcher]="equalMatcher"
+                                        [placeholder]="'ConfirmNewPassword' | localize" [errorStateMatcher]="equalMatcher"
                                         required minlength="2" maxlength="32"
                                         />
                                     <mat-error *ngIf="passwordsFormGroup.errors &&
                                         passwordsFormGroup.errors.areEqual &&
                                         passwordsFormGroup.controls.newPassword.touched
                                         ">
-                                        Passwords do not match
+                                        {{ "PasswordsDoNotMatch" | localize }}
                                     </mat-error>
                                 </mat-form-field>
                             </div>

angular/src/app/users/users.component.html

@@ -92,7 +92,7 @@ <h2>{{ "Users" | localize }}</h2>
                                     </button>
                                     <button mat-menu-item (click)="resetPassword(user)">
                                         <mat-icon>lock</mat-icon>
-                                        <span>{{ "Reset Password" | localize }}</span>
+                                        <span>{{ "ResetPassword" | localize }}</span>
                                     </button>
                                 </mat-menu>
                             </td>

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

@@ -3,7 +3,7 @@ import { MatDialog } from '@angular/material';
 import { finalize } from 'rxjs/operators';
 import { appModuleAnimation } from '@shared/animations/routerTransition';
 import { PagedListingComponentBase, PagedRequestDto } from 'shared/paged-listing-component-base';
-import { UserServiceProxy, UserDto, PagedResultDtoOfUserDto } from '@shared/service-proxies/service-proxies';
+import { UserServiceProxy, UserDto, UserDtoPagedResultDto } from '@shared/service-proxies/service-proxies';
 import { CreateUserDialogComponent } from './create-user/create-user-dialog.component';
 import { EditUserDialogComponent } from './edit-user/edit-user-dialog.component';
 import { Moment } from 'moment';
@@ -23,7 +23,7 @@ class PagedUsersRequestDto extends PagedRequestDto {
             padding: 10px;
           }
         `
-      ]
+    ]
 })
 export class UsersComponent extends PagedListingComponentBase<UserDto> {
     users: UserDto[] = [];
@@ -66,7 +66,7 @@ export class UsersComponent extends PagedListingComponentBase<UserDto> {
                     finishedCallback();
                 })
             )
-            .subscribe((result: PagedResultDtoOfUserDto) => {
+            .subscribe((result: UserDtoPagedResultDto) => {
                 this.users = result.items;
                 this.showPaging(result, pageNumber);
             });

angular/src/shared/AppEnums.ts

@@ -1,8 +1,8 @@
-import { IsTenantAvailableOutputState } from '@shared/service-proxies/service-proxies';
+import { TenantAvailabilityState } from '@shared/service-proxies/service-proxies';
 
 
 export class AppTenantAvailabilityState {
-    static Available: number = IsTenantAvailableOutputState._1;
-    static InActive: number = IsTenantAvailableOutputState._2;
-    static NotFound: number = IsTenantAvailableOutputState._3;
+    static Available: number = TenantAvailabilityState._1;
+    static InActive: number = TenantAvailabilityState._2;
+    static NotFound: number = TenantAvailabilityState._3;
 }