SUPPORT-8975: fix from review

backend/src/main/java/ru/micord/ervu/account_applications/component/exception/GridException.java

@@ -1,14 +0,0 @@
-package ru.micord.ervu.account_applications.component.exception;
-
-/**
- * @author Adel Kalimullin
- */
-public class GridException extends RuntimeException{
-  public GridException(String message) {
-    super(message);
-  }
-
-  public GridException(String message, Throwable cause) {
-    super(message, cause);
-  }
-}

backend/src/main/java/ru/micord/ervu/account_applications/component/exception/UserDataLoadException.java

@@ -0,0 +1,14 @@
+package ru.micord.ervu.account_applications.component.exception;
+
+/**
+ * @author Adel Kalimullin
+ */
+public class UserDataLoadException extends RuntimeException{
+  public UserDataLoadException(String message) {
+    super(message);
+  }
+
+  public UserDataLoadException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}

backend/src/main/java/ru/micord/ervu/account_applications/component/service/ErvuUserGridLoadService.java

@@ -20,7 +20,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 import org.springframework.web.util.UriComponentsBuilder;
-import ru.micord.ervu.account_applications.component.exception.GridException;
+import ru.micord.ervu.account_applications.component.exception.UserDataLoadException;
 import ru.micord.ervu.account_applications.component.field.persist.filter.StaticFilterComponent;
 import ru.micord.ervu.account_applications.component.model.dto.GridServiceRequest;
 import ru.micord.ervu.account_applications.component.model.dto.GridServiceResponse;
@@ -39,7 +39,7 @@ public class ErvuUserGridLoadService extends Behavior implements GridService {
   private static final String FILTER_PATH = "/service/idm/accounts/search/filter/v1";
   private final ObjectMapper objectMapper;
   private final SecurityContext securityContext;
-  @Value("${ervu.http.timeout}")
+  @Value("${ervu.http.timeout:30}")
   private int httpTimeout;
   @Value("${ervu.url}")
   private String ervuUrl;
@@ -101,7 +101,7 @@ public class ErvuUserGridLoadService extends Behavior implements GridService {
       );
     }
     catch (Exception e) {
-      throw new GridException("Ошибка при загрузке данных", e);
+      throw new UserDataLoadException("Ошибка при загрузке данных", e);
     }
   }
 
@@ -158,7 +158,7 @@ public class ErvuUserGridLoadService extends Behavior implements GridService {
       gridRow.put(field.getName(), value != null ? value : "");
     }
     catch (IllegalAccessException e) {
-      throw new GridException("Ошибка при получении значения поля: " + field.getName(), e);
+      throw new UserDataLoadException("Ошибка при получении значения поля: " + field.getName(), e);
     }
   }
 }

config/dev/standalone.xml

@@ -56,6 +56,7 @@
         <property name="fias.enable" value="false"/>
         <property name="registration.enabled" value="false"/>
         <property name="com.arjuna.ats.arjuna.allowMultipleLastResources" value="true"/>
+        <property name="ervu.url" value="true"/>
     </system-properties>
     <management>
         <audit-log>

config/micord.env

@@ -11,3 +11,7 @@ DB_SEC_PASSWORD=ervu_account_applications
 DB_SEC_HOST=10.10.31.118
 DB_SEC_PORT=5432
 DB_SEC_NAME=account_applications
+
+# ERVU properties
+ERVU_URL=
+ERVU_HTTP_TIMEOUT=

frontend/src/ts/account_applications/component/grid/ErvuStaticGrid.ts

@@ -11,7 +11,8 @@ import {
   ValueFormatterParams,
   ValueGetterParams
 } from "ag-grid-community";
-import {StaticColumnInitializer} from "./StaticColumnInitializer";
+import {StaticGridColumnAdapter} from "./StaticGridColumnAdapter";
+
 
 @Component({
              moduleId: module.id,
@@ -51,7 +52,7 @@ export class ErvuStaticGrid extends GridV2 {
   }
 
   protected columnToColumnDef(column: any): ColDef {
-    let colDef = StaticColumnInitializer.columnToColumnDef(this, column);
+    let colDef = StaticGridColumnAdapter.columnToColumnDef(this, column);
     let columnComp = column.context;
     colDef['columnUid'] = columnComp.getObjectId();
 

frontend/src/ts/account_applications/component/grid/StaticGridColumnAdapter.ts

@@ -17,11 +17,11 @@ import {
 import {
   StaticGridColumn
 } from "../../../generated/ru/micord/ervu/account_applications/component/property/grid/StaticGridColumn";
-import {CustomGridColumnFilterUtils} from "./CustomGridColumnFilterUtils";
+import {CustomGridColumnFilterUtils} from "./filter/CustomGridColumnFilterUtils";
 import {Moment} from "moment";
 import * as moment from "moment-timezone";
 
-export class StaticColumnInitializer {
+export class StaticGridColumnAdapter {
 
   public static columnToColumnDef(gridRef: any, column: StaticGridColumn) {
     const columnDef: ColDef = {};

frontend/src/ts/account_applications/component/grid/filter/CheckboxMultiSelectFilterComp.ts

@@ -1,6 +1,6 @@
 import {AgPromise, IDoesFilterPassParams, IFilterComp, IFilterParams} from "ag-grid-community";
 
-export class SetFilter implements IFilterComp {
+export class CheckboxMultiSelectFilterComp implements IFilterComp {
 
   private OPTION_TEMPLATE = `<label class="ag-set-filter-item">
                                <input type="checkbox" class="ag-filter-checkbox" checked/>

frontend/src/ts/account_applications/component/grid/filter/CustomGridColumnFilterUtils.ts

@@ -1,8 +1,9 @@
 import {
   FilterType
-} from "../../../generated/ru/micord/ervu/account_applications/component/property/grid/FilterType";
+} from "../../../../generated/ru/micord/ervu/account_applications/component/property/grid/FilterType";
 import {DateFilter, NumberFilter, TextFilter} from "ag-grid-community";
-import {SetFilter} from "./SetFilter";
+import {CheckboxMultiSelectFilterComp} from "./CheckboxMultiSelectFilterComp";
+
 
 export class CustomGridColumnFilterUtils {
 
@@ -17,7 +18,7 @@ export class CustomGridColumnFilterUtils {
       case FilterType.DATE:
         return DateFilter;
       case FilterType.SET:
-        return SetFilter;
+        return CheckboxMultiSelectFilterComp;
       case FilterType.TEXT:
       default:
         return TextFilter;