Bugfix/10.4/549 improve the elastic index loading in the application (#657)

mjabascal10 · web-flow · commit 903a212a2f54 · 2024-05-28T23:25:14.000+03:00
* Fixed Improve the elastic index loading in the application (#549) * Fixed Improve the elastic index loading in the application (#549) * Fixed elastic index loading in the application (#549) * Fixed elastic index loading in the application (#549) * Improve the elastic index loading in the application (657) * Improve the elastic index loading in the application (657) * Improve the elastic index loading in the application (657) * Update version.yml
diff --git a/backend/src/main/java/com/park/utmstack/service/dto/index_pattern/UtmIndexPatternField.java b/backend/src/main/java/com/park/utmstack/service/dto/index_pattern/UtmIndexPatternField.java
@@ -0,0 +1,33 @@
+package com.park.utmstack.service.dto.index_pattern;
+
+import com.park.utmstack.util.chart_builder.IndexPropertyType;
+
+import java.util.List;
+
+public class UtmIndexPatternField {
+    String indexPattern;
+    List<IndexPropertyType> fields;
+
+    public UtmIndexPatternField(){};
+
+    public UtmIndexPatternField(String indexPatter, List<IndexPropertyType> fields) {
+        this.indexPattern = indexPatter;
+        this.fields = fields;
+    }
+
+    public String getIndexPattern() {
+        return indexPattern;
+    }
+
+    public void setIndexPattern(String indexPattern) {
+        this.indexPattern = indexPattern;
+    }
+
+    public List<IndexPropertyType> getFields() {
+        return fields;
+    }
+
+    public void setFields(List<IndexPropertyType> fields) {
+        this.fields = fields;
+    }
+}
diff --git a/backend/src/main/java/com/park/utmstack/service/index_pattern/UtmIndexPatternQueryService.java b/backend/src/main/java/com/park/utmstack/service/index_pattern/UtmIndexPatternQueryService.java
@@ -4,16 +4,20 @@
 import com.park.utmstack.domain.index_pattern.UtmIndexPattern_;
 import com.park.utmstack.repository.index_pattern.UtmIndexPatternRepository;
 import com.park.utmstack.service.dto.index_pattern.UtmIndexPatternCriteria;
+import com.park.utmstack.service.dto.index_pattern.UtmIndexPatternField;
+import com.park.utmstack.service.elasticsearch.ElasticsearchService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tech.jhipster.service.QueryService;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(readOnly = true)
@@ -22,8 +26,11 @@ public class UtmIndexPatternQueryService extends QueryService<UtmIndexPattern> {
 
     private final UtmIndexPatternRepository indexPatternRepository;
 
-    public UtmIndexPatternQueryService(UtmIndexPatternRepository indexPatternRepository) {
+    private final ElasticsearchService elasticsearchService;
+
+    public UtmIndexPatternQueryService(UtmIndexPatternRepository indexPatternRepository, ElasticsearchService elasticsearchService) {
         this.indexPatternRepository = indexPatternRepository;
+        this.elasticsearchService = elasticsearchService;
     }
 
     @Transactional(readOnly = true)
@@ -40,6 +47,27 @@ public Page<UtmIndexPattern> findByCriteria(UtmIndexPatternCriteria criteria, Pa
         return indexPatternRepository.findAll(specification, page);
     }
 
+    @Transactional(readOnly = true)
+    public Page<UtmIndexPatternField> findWithFieldsByCriteria(UtmIndexPatternCriteria criteria, Pageable page) {
+        log.debug("find by criteria : {}, page: {}", criteria, page);
+        final Specification<UtmIndexPattern> specification = createSpecification(criteria);
+
+        Page<UtmIndexPattern> indexPatterns = indexPatternRepository.findAll(specification, page);
+
+        List<UtmIndexPatternField> utmIndexPatternFields = indexPatterns.getContent().stream()
+                .map(index -> {
+                    try {
+                        return new UtmIndexPatternField(index.getPattern(), elasticsearchService.getIndexProperties(index.getPattern()));
+                    } catch (Exception e) {
+                        log.error("Error fetching index properties for pattern: {}", index.getPattern(), e);
+                        return new UtmIndexPatternField(index.getPattern(), null);
+                    }
+                }).collect(Collectors.toList());
+
+        return new PageImpl<>(utmIndexPatternFields, page, indexPatterns.getTotalElements());
+    }
+
+
     private Specification<UtmIndexPattern> createSpecification(UtmIndexPatternCriteria criteria) {
         Specification<UtmIndexPattern> specification = Specification.where(null);
         if (criteria != null) {
diff --git a/backend/src/main/java/com/park/utmstack/web/rest/index_pattern/UtmIndexPatternResource.java b/backend/src/main/java/com/park/utmstack/web/rest/index_pattern/UtmIndexPatternResource.java
@@ -5,6 +5,7 @@
 import com.park.utmstack.service.UtmStackService;
 import com.park.utmstack.service.application_events.ApplicationEventService;
 import com.park.utmstack.service.dto.index_pattern.UtmIndexPatternCriteria;
+import com.park.utmstack.service.dto.index_pattern.UtmIndexPatternField;
 import com.park.utmstack.service.index_pattern.UtmIndexPatternQueryService;
 import com.park.utmstack.service.index_pattern.UtmIndexPatternService;
 import com.park.utmstack.web.rest.util.HeaderUtil;
@@ -128,6 +129,23 @@ public ResponseEntity<List<UtmIndexPattern>> getAllUtmIndexPatterns(UtmIndexPatt
         }
     }
 
+    @GetMapping("/utm-index-patterns/fields")
+    public ResponseEntity<List<UtmIndexPatternField>> getAllUtmIndexPatternsWithFields(UtmIndexPatternCriteria criteria,
+                                                                                       Pageable pageable) {
+        final String ctx = CLASSNAME + ".getAllUtmIndexPatternsWithFields";
+        try {
+            Page<UtmIndexPatternField> page = indexPatternQueryService.findWithFieldsByCriteria(criteria, pageable);
+            HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(page, "/api/utm-index-patterns-fields");
+            return ResponseEntity.ok().headers(headers).body(page.getContent());
+        } catch (Exception e) {
+            String msg = ctx + ": " + e.getMessage();
+            log.error(msg);
+            applicationEventService.createEvent(msg, ApplicationEventType.ERROR);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).headers(
+                    HeaderUtil.createFailureAlert(null, null, msg)).body(null);
+        }
+    }
+
     /**
      * GET  /utm-index-patterns/:id : get the "id" utmIndexPattern.
      *
diff --git a/frontend/src/app/dashboard/dashboard-overview/dashboard-overview.component.ts b/frontend/src/app/dashboard/dashboard-overview/dashboard-overview.component.ts
@@ -1,9 +1,10 @@
+import {HttpResponse} from '@angular/common/http';
 import {Component, OnDestroy, OnInit} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
 import {NgxSpinnerService} from 'ngx-spinner';
 import {Subject} from 'rxjs';
-import {takeUntil} from 'rxjs/operators';
+import {filter, map, takeUntil} from 'rxjs/operators';
 // tslint:disable-next-line:max-line-length
 import {UtmModulesEnum} from '../../app-module/shared/enum/utm-module.enum';
 import {UtmModulesService} from '../../app-module/shared/services/utm-modules.service';
@@ -32,7 +33,9 @@ import {LocalFieldService} from '../../shared/services/elasticsearch/local-field
 import {ExportPdfService} from '../../shared/services/util/export-pdf.service';
 import {ChartSerieValueType} from '../../shared/types/chart-reponse/chart-serie-value.type';
 import {ElasticFilterType} from '../../shared/types/filter/elastic-filter.type';
+import {UtmIndexPattern} from '../../shared/types/index-pattern/utm-index-pattern';
 import {buildFormatInstantFromDate} from '../../shared/util/utm-time.util';
+import {UtmIndexPatternFields} from "../../shared/types/index-pattern/utm-index-pattern-fields";
 
 @Component({
   selector: 'app-dashboard-overview',
@@ -248,14 +251,16 @@ export class DashboardOverviewComponent implements OnInit, OnDestroy {
   synchronizeFields() {
     this.accountService.identity(true).then(value => {
       if (value) {
-        this.indexPatternService.query({page: 0, size: 2000}).subscribe(responsePatterns => {
-          for (const pattern of responsePatterns.body) {
-            this.indexPatternFieldService.getElasticIndexField({indexPattern: pattern.pattern})
-              .subscribe(responseFields => {
-                this.localFieldService.setPatternStoredFields(pattern.pattern, responseFields.body);
+        this.indexPatternService.queryWithFields({page: 0, size: 2000, 'isActive.equals': true})
+            .pipe(
+                map(response => response.body))
+            .subscribe((values: UtmIndexPatternFields[]) => {
+              values.forEach(value => {
+                if (value.fields && value.fields.length > 0) {
+                  this.localFieldService.setPatternStoredFields(value.indexPattern, value.fields);
+                }
               });
-          }
-        });
+            });
       }
     });
   }
diff --git a/frontend/src/app/shared/components/layout/header/header-menu-navigation/header-menu-navigation.component.ts b/frontend/src/app/shared/components/layout/header/header-menu-navigation/header-menu-navigation.component.ts
@@ -1,6 +1,7 @@
-import {Component, OnInit} from '@angular/core';
+import {Component, OnDestroy, OnInit} from '@angular/core';
 import {Router} from '@angular/router';
 import {NgxSpinnerService} from 'ngx-spinner';
+import {Subject} from 'rxjs';
 import {HttpCancelService} from '../../../../../blocks/service/httpcancel.service';
 import {DashboardBehavior} from '../../../../behaviors/dashboard.behavior';
 import {MenuBehavior} from '../../../../behaviors/menu.behavior';
@@ -10,18 +11,20 @@ import {ActiveAdModuleActiveService} from '../../../../services/active-modules/a
 import {MenuService} from '../../../../services/menu/menu.service';
 import {Menu} from '../../../../types/menu/menu.model';
 import {stringParamToQueryParams} from '../../../../util/query-params-to-filter.util';
+import { takeUntil } from 'rxjs/operators';
 
 @Component({
   selector: 'app-header-menu-navigation',
   templateUrl: './header-menu-navigation.component.html',
   styleUrls: ['./header-menu-navigation.component.scss']
 })
-export class HeaderMenuNavigationComponent implements OnInit {
+export class HeaderMenuNavigationComponent implements OnInit, OnDestroy {
   menus: Menu[] = [];
   defaultStructureMenu: Menu[] = [];
   searching = false;
   iconPath = SYSTEM_MENU_ICONS_PATH;
   active: number;
+  destroy$: Subject<void> =  new Subject<void>();
 
   constructor(private adModuleActiveService: ActiveAdModuleActiveService,
               private navBehavior: NavBehavior,
@@ -35,6 +38,14 @@ export class HeaderMenuNavigationComponent implements OnInit {
 
   ngOnInit() {
     this.loadMenus();
+
+    this.navBehavior.$nav
+        .pipe(takeUntil(this.destroy$))
+        .subscribe( value => {
+      if (value) {
+        this.loadMenus();
+      }
+    });
   }
 
   /**
@@ -50,7 +61,6 @@ export class HeaderMenuNavigationComponent implements OnInit {
   }
 
   loadMenus() {
-    this.menus = [];
     this.menuService.getMenuStructure(true).subscribe(reponse => {
       this.menus = reponse.body;
       this.defaultStructureMenu = reponse.body;
@@ -118,4 +128,9 @@ export class HeaderMenuNavigationComponent implements OnInit {
       return false;
     }
   }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
 }
diff --git a/frontend/src/app/shared/services/elasticsearch/index-pattern.service.ts b/frontend/src/app/shared/services/elasticsearch/index-pattern.service.ts
@@ -4,6 +4,7 @@ import {Observable} from 'rxjs';
 import {SERVER_API_URL} from '../../../app.constants';
 import {UtmIndexPattern} from '../../types/index-pattern/utm-index-pattern';
 import {createRequestOption} from '../../util/request-util';
+import {UtmIndexPatternFields} from "../../types/index-pattern/utm-index-pattern-fields";
 
 @Injectable({
   providedIn: 'root'
@@ -34,6 +35,14 @@ export class IndexPatternService {
     });
   }
 
+  queryWithFields(req?: any): Observable<HttpResponse<UtmIndexPatternFields[]>> {
+    const options = createRequestOption(req);
+    return this.http.get<UtmIndexPatternFields[]>(`${this.resourceUrl}/fields`, {
+      params: options,
+      observe: 'response'
+    });
+  }
+
   delete(indexPattern: number): Observable<HttpResponse<any>> {
     return this.http.delete(`${this.resourceUrl}/${indexPattern}`, {observe: 'response'});
   }
diff --git a/frontend/src/app/shared/types/index-pattern/utm-index-pattern-fields.ts b/frontend/src/app/shared/types/index-pattern/utm-index-pattern-fields.ts
@@ -0,0 +1,11 @@
+import {ElasticSearchFieldInfoType} from '../elasticsearch/elastic-search-field-info.type';
+
+export class UtmIndexPatternFields {
+  indexPattern: string;
+  fields: ElasticSearchFieldInfoType[];
+
+  constructor(indexPattern: string, fields: ElasticSearchFieldInfoType[]) {
+    this.indexPattern = indexPattern;
+    this.fields = fields;
+  }
+}
diff --git a/frontend/src/app/shared/types/index-pattern/utm-index-pattern.ts b/frontend/src/app/shared/types/index-pattern/utm-index-pattern.ts
@@ -3,11 +3,13 @@ export class UtmIndexPattern {
   pattern: string;
   patternSystem?: boolean;
   patternModule?: string;
+  active?: boolean;
 
-  constructor(id: number, pattern: string, patternSystem: boolean, patternModule?: string) {
+  constructor(id: number, pattern: string, patternSystem: boolean, patternModule?: string, active?: boolean) {
     this.id = id;
     this.pattern = pattern;
     this.patternSystem = patternSystem;
     this.patternModule = patternModule;
+    this.active = active;
   }
 }
diff --git a/version.yml b/version.yml
@@ -1 +1 @@
-version: 10.4.2
+version: 10.4.3

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,13 @@ export class UtmIndexPattern {`
`3`	`3`	`pattern: string;`
`4`	`4`	`patternSystem?: boolean;`
`5`	`5`	`patternModule?: string;`
	`6`	`+ active?: boolean;`
`6`	`7`
`7`		`- constructor(id: number, pattern: string, patternSystem: boolean, patternModule?: string) {`
	`8`	`+ constructor(id: number, pattern: string, patternSystem: boolean, patternModule?: string, active?: boolean) {`
`8`	`9`	`this.id = id;`
`9`	`10`	`this.pattern = pattern;`
`10`	`11`	`this.patternSystem = patternSystem;`
`11`	`12`	`this.patternModule = patternModule;`
	`13`	`+ this.active = active;`
`12`	`14`	`}`
`13`	`15`	`}`