Skip to content

Commit f9491e7

Browse files
committed
feat: replace hardcoded search limit with MAX_SEARCH_RESULTS constant
Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>
1 parent a1d5f19 commit f9491e7

File tree

8 files changed

+15
-9
lines changed

8 files changed

+15
-9
lines changed

frontend/src/app/data-management/alert-management/alert-view/alert-view.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {NgxSpinnerService} from 'ngx-spinner';
88
import {LocalStorageService} from 'ngx-webstorage';
99
import {Observable, Subject} from 'rxjs';
1010
import {filter, takeUntil, tap} from 'rxjs/operators';
11-
import {TimelineItem} from 'src/app/shared/types/utm-timeline-item';
1211
import {UtmToastService} from '../../../shared/alert/utm-toast.service';
1312
import {
1413
ElasticFilterDefaultTime
@@ -30,7 +29,7 @@ import {
3029
ALERT_ECHOES_FIELD
3130
} from '../../../shared/constants/alert/alert-field.constant';
3231
import {AUTOMATIC_REVIEW, IGNORED} from '../../../shared/constants/alert/alert-status.constant';
33-
import {ADMIN_ROLE} from '../../../shared/constants/global.constant';
32+
import {ADMIN_ROLE, MAX_SEARCH_RESULTS} from '../../../shared/constants/global.constant';
3433
import {MAIN_INDEX_PATTERN} from '../../../shared/constants/main-index-pattern.constant';
3534
import {ITEMS_PER_PAGE} from '../../../shared/constants/pagination.constants';
3635
import {SortDirection} from '../../../shared/directives/sortable/type/sort-direction.type';
@@ -340,7 +339,7 @@ export class AlertViewComponent implements OnInit, OnDestroy {
340339

341340
getAlert(calledFrom?: string, filtersParam?: ElasticFilterType[]) {
342341
this.elasticDataService.search(this.page, this.itemsPerPage,
343-
100000000, this.dataNature,
342+
MAX_SEARCH_RESULTS, this.dataNature,
344343
sanitizeFilters(this.filters), this.sortBy, true).subscribe(
345344
(res: HttpResponse<any>) => {
346345
this.totalItems = Number(res.headers.get('X-Total-Count'));

frontend/src/app/data-management/alert-management/shared/components/alert-echoes-timeline/alert-echoes-timeline.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {ElasticFilterType} from '../../../../../shared/types/filter/elastic-filt
1515
import {TimelineItem} from '../../../../../shared/types/utm-timeline-item';
1616
import {sanitizeFilters} from '../../../../../shared/util/elastic-filter.util';
1717
import {AlertEchoesTimelineService, TimelineGroup} from './alert-echoes-timeline.service';
18+
import {MAX_SEARCH_RESULTS} from "../../../../../shared/constants/global.constant";
1819

1920

2021
@Component({
@@ -178,7 +179,7 @@ export class AlertEchoesTimelineComponent implements OnInit {
178179
loadData() {
179180
this.loading = true;
180181
this.elasticDataService.search(this.page, this.pageSize,
181-
100000000, DataNatureTypeEnum.ALERT,
182+
MAX_SEARCH_RESULTS, DataNatureTypeEnum.ALERT,
182183
sanitizeFilters(this.filters), this.sortBy, true)
183184
.subscribe(
184185
(res: HttpResponse<any>) => {

frontend/src/app/data-management/alert-management/shared/components/alert-echoes/alert-echoes.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {UtmAlertType} from '../../../../../shared/types/alert/utm-alert.type';
1717
import {ElasticFilterType} from '../../../../../shared/types/filter/elastic-filter.type';
1818
import {sanitizeFilters} from '../../../../../shared/util/elastic-filter.util';
1919
import {EventDataTypeEnum} from '../../enums/event-data-type.enum';
20+
import {MAX_SEARCH_RESULTS} from "../../../../../shared/constants/global.constant";
2021

2122
@Component({
2223
selector: 'app-alert-echoes',
@@ -61,7 +62,7 @@ export class AlertEchoesComponent implements OnInit {
6162
loadChildrenAlerts() {
6263
this.loading = true;
6364
this.elasticDataService.search(this.page, this.itemsPerPage,
64-
100000000, this.dataNature,
65+
MAX_SEARCH_RESULTS, this.dataNature,
6566
sanitizeFilters(this.filters), this.sortBy, true).subscribe(
6667
(res: HttpResponse<any>) => {
6768
this.totalItems = Number(res.headers.get('X-Total-Count'));

frontend/src/app/data-management/alert-management/shared/components/alert-rule-create/alert-rule-create.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ import {AlertRulesService} from '../../services/alert-rules.service';
5454
import {AlertTagService} from '../../services/alert-tag.service';
5555
import {setAlertPropertyValue} from '../../util/alert-util-function';
5656
import {AlertActionRefreshService} from "../../services/alert-action-refresh.service";
57+
import {MAX_SEARCH_RESULTS} from "../../../../../shared/constants/global.constant";
5758

5859
@Component({
5960
selector: 'app-alert-rule-create',
@@ -415,7 +416,7 @@ export class AlertRuleCreateComponent implements OnInit, OnDestroy {
415416
this.elasticDataService.search(
416417
this.alertRequest.page,
417418
this.alertRequest.size,
418-
100000000,
419+
MAX_SEARCH_RESULTS,
419420
this.alertRequest.dataNature,
420421
sanitizeFilters(this.alertRequest.filters),
421422
this.alertRequest.sort).subscribe(

frontend/src/app/data-management/file-management/file-view/file-view.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
import {AccessMaskEnum} from '../shared/enum/access-mask.enum';
3232
import {FileFieldEnum} from '../shared/enum/file-field.enum';
3333
import {FileQueryParamEnum} from '../shared/enum/file-query-param.enum';
34+
import {MAX_SEARCH_RESULTS} from "../../../shared/constants/global.constant";
3435

3536
@Component({
3637
selector: 'app-file-view',
@@ -150,7 +151,7 @@ export class FileViewComponent implements OnInit {
150151

151152
getFiles(calledFrom?: string) {
152153
this.elasticDataService.search(this.page, this.itemsPerPage,
153-
100000000, LOG_INDEX_WINLOGBEAT,
154+
MAX_SEARCH_RESULTS, LOG_INDEX_WINLOGBEAT,
154155
sanitizeFilters(this.filters), this.sortBy).subscribe(
155156
(res: HttpResponse<any>) => {
156157
this.totalItems = Number(res.headers.get('X-Total-Count'));

frontend/src/app/incident-response/shared/services/alert.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {UtmToastService} from '../../../shared/alert/utm-toast.service';
66
import {ElasticDataService} from '../../../shared/services/elasticsearch/elastic-data.service';
77
import {RefreshDataService} from '../../../shared/services/util/refresh-data.service';
88
import {sanitizeFilters} from '../../../shared/util/elastic-filter.util';
9+
import {MAX_SEARCH_RESULTS} from "../../../shared/constants/global.constant";
910

1011
@Injectable(
1112
{
@@ -23,7 +24,7 @@ export class AlertService extends RefreshDataService<boolean, any[]> {
2324
return this.elasticDataService.search(
2425
request.page,
2526
request.size,
26-
100000000,
27+
MAX_SEARCH_RESULTS,
2728
request.dataNature,
2829
sanitizeFilters(request.filters),
2930
request.sort)

frontend/src/app/shared/constants/global.constant.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ export const DEMO_URL = 'https://demo.utmstack.com/';
55
export const LOG_SOURCE_DASHBOARD_NAME = 'Log source system';
66
export const SAAS_DEFAULT_PASSWORD = 'DefaultPa$$word!';
77
export const ONLINE_DOCUMENTATION_BASE = 'https://docs.utmstack.com/UTMStackDocumentationSite/';
8+
export const MAX_SEARCH_RESULTS = 100000;
9+

frontend/src/environments/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
export const environment = {
66
production: false,
7-
SERVER_API_URL: 'https://192.168.1.18/',
7+
SERVER_API_URL: 'https://10.11.12.113/',
88
//SERVER_API_URL: 'http://localhost:8080/',
99
SERVER_API_CONTEXT: '',
1010
SESSION_AUTH_TOKEN: window.location.host.split(':')[0].toLocaleUpperCase(),

0 commit comments

Comments
 (0)