Merge branch 'hotfix/1.9.5'

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

frontend/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu.lkrp</groupId>
     <artifactId>fl</artifactId>
-    <version>1.9.4</version>
+    <version>1.9.5</version>
   </parent>
 
   <groupId>ru.micord.ervu.lkrp.fl</groupId>

frontend/src/resources/template/app/component/app_header.html

@@ -1,7 +1,7 @@
 <nav class="header" id="webbpm-header" [ngClass]="{'header-landing': isLanding}">
     <div *ngIf="isLanding">
         <div class="header-logo"></div>
-        <div class="header-title">Реестр повесток юридических лиц</div>
+        <div class="header-title">Реестр повесток физических лиц</div>
     </div>
     <div *ngIf="!isLanding" class="header-logo">
         <div class="logo"><a routerLink="/"></a></div>

frontend/src/ts/ervu/component/button/ExtractLoadService.ts

@@ -26,7 +26,9 @@ export class ExtractLoadService extends Behavior {
     super.initialize();
     this.button = this.getScript(AbstractButton);
     this.httpClient = this.injector.get(HttpClient);
+    this.errorEvent.subscribe(() => console.log("error event occurred", this.errorEvent));
     this.onClickFunction = () => {
+      console.log("click event occurred");
       this.httpClient.get('extract/' + this.formatRegistry, {
         responseType: 'blob',
         observe: 'response'

frontend/src/ts/ervu/component/container/LoadForm.ts

@@ -18,7 +18,7 @@ export class LoadForm extends Container {
   private ervuDataService: ErvuDataService;
   private subscription: Subscription;
   private fields: any[];
-  private fieldDataList: FieldData[] = [];
+  private fieldDataList: FieldData[];
 
   constructor(el: ElementRef, cd: ChangeDetectorRef) {
     super(el, cd);
@@ -30,7 +30,7 @@ export class LoadForm extends Container {
   }
 
   protected loadContainer(): Promise<any> {
-    return Promise.resolve(this.loadData());
+    return this.fieldDataList ? this.loadData() : Promise.resolve();
   }
 
   initialize() {
@@ -39,6 +39,7 @@ export class LoadForm extends Container {
     this.ervuDataService = this.injector.get(ErvuDataService);
     this.subscription = this.ervuDataService.message.subscribe(value => {
       if (value) {
+        this.fieldDataList = [];
         this.fields.forEach(field => {
           let fieldData: FieldData = new FieldData();
           fieldData.componentGuid = field.objectId;

frontend/src/ts/ervu/component/grid/InMemoryStaticGrid.ts

@@ -35,7 +35,10 @@ export class InMemoryStaticGrid extends GridV2 {
   protected initGrid() {
     super.initGrid();
     this.subscription = this.injector.get(ErvuDataService).message.subscribe(value => {
-      this.rowData = value ? value[this.dataList] : null;
+      this.rowData = value[this.dataList];
+      this.initDeferred.promise.then(() => {
+        this.refreshData();
+      });
     });
   }