Merge branch 'master' into master

Author: alirizaadiyahsi

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

@@ -14,9 +14,13 @@ import {
 import { CreateRoleDialogComponent } from './create-role/create-role-dialog.component';
 import { EditRoleDialogComponent } from './edit-role/edit-role-dialog.component';
 
+class PagedRolesRequestDto extends PagedRequestDto{
+    keyword: string;
+}
+
 @Component({
-  templateUrl: './roles.component.html',
-  animations: [appModuleAnimation()]
+    templateUrl: './roles.component.html',
+    animations: [appModuleAnimation()]
 })
 export class RolesComponent extends PagedListingComponentBase<RoleDto> {
   roles: RoleDto[] = [];
@@ -83,7 +87,7 @@ export class RolesComponent extends PagedListingComponentBase<RoleDto> {
         data: id
       });
     }
-
+    
     createOrEditRoleDialog.afterClosed().subscribe(result => {
       if (result) {
         this.refresh();

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

@@ -14,6 +14,11 @@ import {
 import { CreateTenantDialogComponent } from './create-tenant/create-tenant-dialog.component';
 import { EditTenantDialogComponent } from './edit-tenant/edit-tenant-dialog.component';
 
+class PagedTenantsRequestDto extends PagedRequestDto{
+    keyword: string;
+    isActive: boolean | null;
+}
+
 @Component({
   templateUrl: './tenants.component.html',
   animations: [appModuleAnimation()]

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

@@ -85,4 +85,4 @@ export class UsersComponent extends PagedListingComponentBase<UserDto> {
       }
     });
   }
-}
+}

angular/src/assets/appconfig.production.json

@@ -0,0 +1,18 @@
+{
+  "remoteServiceBaseUrl": "http://localhost:21021",
+  "appBaseUrl": "http://localhost:4200",
+  "localeMappings": [
+    {
+      "from": "pt-BR",
+      "to": "pt"
+    },
+    {
+      "from": "zh-CN",
+      "to": "zh"
+    },
+    {
+      "from": "he-IL",
+      "to": "he"
+    }
+  ]
+}

angular/src/environments/environment.prod.ts

@@ -3,5 +3,5 @@
 export const environment = {
     production: true,
     hmr: false,
-    appConfig: 'appconfig.json'
+    appConfig: 'appconfig.production.json'
 };