Merge branch 'develop' into release/1.9.14

# Conflicts:
#	backend/pom.xml
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml

frontend/src/resources/css/components-autority.css

@@ -300,6 +300,10 @@
 .webbpm.account-applications dropdown-tree-view .bi-caret-right-fill::before {
     content: "\f4fd";
 }
+.webbpm.account-applications dropdown-tree-view :focus {
+    outline: none !important;
+    box-shadow: none !important;
+}
 /* DropDownTree end */
 
 .webbpm.account-applications .selectize-dropdown, 

frontend/src/resources/template/account_applications/component/field/DropdownTreeView.html

@@ -4,7 +4,7 @@
            [hidden]="!label" class="control-label">
         <span>{{label}}<span *ngIf="isRequired()" class="alarm"> *</span></span>
     </label>
-    <div>
+    <div tabindex="0" (keydown)="onKeyDown($event)">
         <ngx-dropdown-treeview-select
             [items]="items"
             [maxHeight]="maxHeight"

frontend/src/ts/account_applications/component/button/UserManagementService.ts

@@ -48,15 +48,16 @@ export class UserManagementService extends Behavior {
   private onClickFunction: Function;
   private sendToErvu: boolean = false;
   private rpc: UserApplicationListRpcService;
+  private authService: AuthorizationService;
 
   initialize() {
     super.initialize();
     this.button = this.getScript(SaveButton);
     this.httpClient = this.injector.get(HttpClient);
     this.rpc = this.getScript(UserApplicationListRpcService);
-    let authService = this.injector.get(AuthorizationService);
+    this.authService = this.injector.get(AuthorizationService);
     this.onClickFunction = () => {
-      if (!authService.hasRole('security_administrator') || !this.sendToErvu) {
+      if (!this.authService.hasRole('security_administrator') || !this.sendToErvu) {
         return;
       }
       let kind = this.applicationKind.getValue();
@@ -79,6 +80,7 @@ export class UserManagementService extends Behavior {
           request = new CreateAccountRequest();
           request.data = createData;
           request.processKey = ProcessKey.CREATE;
+          this.doRequest(request, formJson['appNumber']);
           break;
         case ApplicationKind.EDIT_USER_MAIN:
           let editPersonData = new EditPersonData();
@@ -87,6 +89,7 @@ export class UserManagementService extends Behavior {
           request = new EditPersonRequest();
           request.data = editPersonData;
           request.processKey = ProcessKey.EDIT_PERSON;
+          this.doRequest(request, formJson['appNumber']);
           break;
         case ApplicationKind.EDIT_USER_ACCOUNT:
           let editAccountData = new EditAccountData();
@@ -96,6 +99,7 @@ export class UserManagementService extends Behavior {
           request = new EditAccountRequest();
           request.data = editAccountData;
           request.processKey = ProcessKey.EDIT_ACCOUNT;
+          this.doRequest(request, formJson['appNumber']);
           break;
         case ApplicationKind.EDIT_USER_ROLES:
           let editRolesAccount = new EditRolesAccount();
@@ -108,12 +112,15 @@ export class UserManagementService extends Behavior {
             return role;
           });
           this.rpc.getRemovedRoleIds(accountId, rolesList)
-              .then(list => editRolesAccount.removeRoles = list);
-          let editRolesData = new EditRolesData();
-          editRolesData.account = editRolesAccount;
-          request = new EditRolesRequest();
-          request.data = editRolesData;
-          request.processKey = ProcessKey.EDIT_ROLES;
+              .then(list => {
+                editRolesAccount.removeRoles = list;
+                let editRolesData = new EditRolesData();
+                editRolesData.account = editRolesAccount;
+                request = new EditRolesRequest();
+                request.data = editRolesData;
+                request.processKey = ProcessKey.EDIT_ROLES;
+                this.doRequest(request, formJson['appNumber']);
+              });
           break;
         case ApplicationKind.BLOCK_USER:
           let deactivationData = new ChangeActivationData();
@@ -121,6 +128,7 @@ export class UserManagementService extends Behavior {
           request = new ChangeActivationRequest();
           request.data = deactivationData;
           request.processKey = ProcessKey.DEACTIVATE;
+          this.doRequest(request, formJson['appNumber']);
           break;
         case ApplicationKind.UNBLOCK_USER:
           let activationData = new ChangeActivationData();
@@ -128,6 +136,7 @@ export class UserManagementService extends Behavior {
           request = new ChangeActivationRequest();
           request.data = activationData;
           request.processKey = ProcessKey.ACTIVATE;
+          this.doRequest(request, formJson['appNumber']);
           break;
         case ApplicationKind.RESET_PASSWORD:
           let resetPasswordAccount = new ResetPasswordAccount();
@@ -137,12 +146,10 @@ export class UserManagementService extends Behavior {
           request = new ResetPasswordRequest();
           request.data = resetPasswordData;
           request.processKey = ProcessKey.RESET_PASSWORD;
+          this.doRequest(request, formJson['appNumber']);
           break;
       }
-
-      request.userId = authService.getUserId();
-      this.doRequest(request, formJson['appNumber']);
-    }
+    };
   }
 
   @Visible()
@@ -171,6 +178,7 @@ export class UserManagementService extends Behavior {
 
   private doRequest(request: any, appNumber: number): void {
     const url = window.location.origin + UserManagementService.PROCESS_START_PATH;
+    request.userId = this.authService.getUserId();
     this.httpClient.post(url, request).toPromise()
         .then((response: ProcessResponse) => {
           let code = response.code;

frontend/src/ts/account_applications/component/field/DropdownTreeViewComponent.ts

@@ -8,6 +8,7 @@ import {
 import {
   AdvancedProperty,
   Event,
+  EventUtils,
   InputControl,
   LocalStorageService,
   NotNull,
@@ -269,6 +270,15 @@ export class DropdownTreeViewComponent extends InputControl {
     return null;
   }
 
+  onKeyDown(event: KeyboardEvent): void {
+    const isInput = (event.target as HTMLElement).tagName === 'INPUT';
+    if (EventUtils.isKeyBackspace(event) && !isInput && this.value) {
+      this.clearValue();
+      event.stopPropagation();
+      event.preventDefault();
+    }
+  }
+
   onChange() {
     super.onChange();
     this.valueChangeEvent.trigger(this.value);

frontend/src/ts/modules/app/app-routing.module.ts

@@ -5,11 +5,6 @@ import {RolesGuard} from "./guard/RolesGuard";
 
 
 const appRoutes: Routes = [
-  {
-    path: 'home',
-    loadChildren: 'generated-sources/page-home.module#PagehomeModule',
-    canActivate: [ConfirmExitGuard, RolesGuard]
-  },
   {
     path: 'app_list',
     loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',

frontend/src/ts/modules/mfe/mfe-webbpm-routing.module.ts

@@ -13,7 +13,7 @@ const webbpmRoutes: Routes = [
   },
   {
     path: '',
-    loadChildren: 'generated-sources/page-home.module#PagehomeModule',
+    loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',
     canActivate: [ConfirmExitGuard, RolesGuard],
     pathMatch: 'full',
   },

frontend/src/ts/modules/webbpm/webbpm-routing.module.ts

@@ -13,7 +13,7 @@ const webbpmRoutes: Routes = [
   },
   {
     path: '',
-    loadChildren: 'generated-sources/page-home.module#PagehomeModule',
+    loadChildren: 'generated-sources/page-app_list.module#Pageapp_listModule',
     canActivate: [ConfirmExitGuard, RolesGuard],
     pathMatch: 'full',
   },