Skip to content

Commit 374ac56

Browse files
committed
Merge remote-tracking branch 'origin/release/v11.2.2' into release/v11.2.2
2 parents b144468 + 07009f8 commit 374ac56

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

frontend/src/app/app-module/app-module-view/app-module-view.component.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ export class AppModuleViewComponent implements OnInit, OnDestroy {
9292
return res.body ? res.body.sort((a, b) => a > b ? 1 : -1) : [];
9393
}),
9494
catchError(error => {
95-
console.log(error);
9695
this.utmToastService.showError('Failed to fetch categories',
9796
'An error occurred while fetching module data.');
9897
return of([]);
@@ -116,14 +115,12 @@ export class AppModuleViewComponent implements OnInit, OnDestroy {
116115
}
117116

118117
filterByCategory($event: any) {
119-
console.log('filter');
120118
this.req['moduleCategory.equals'] = $event;
121119
this.refreshModules();
122120

123121
}
124122

125123
onSearch($event: string) {
126-
console.log('search');
127124
this.req.page = 0;
128125
this.req['prettyName.contains'] = $event;
129126
this.refreshModules();

frontend/src/app/app-module/services/module.service.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export class ModuleService {
4040
}),
4141
shareReplay(1),
4242
catchError(error => {
43-
console.error(error);
4443
this.utmToastService.showError(
4544
'Failed to fetch servers',
4645
'An error occurred while fetching server list.'
@@ -84,7 +83,7 @@ export class ModuleService {
8483
m.prettyName = m.prettyName + ' GravityZone';
8584
}
8685
});
87-
return response.body.filter(m => m.moduleName !== this.utmModulesEnum.AS_400);
86+
return response.body;
8887
}),
8988
catchError(error => {
9089
console.error(error);

frontend/src/app/graphic-builder/chart-builder/chart-builder.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import {CodeEditorComponent, ConsoleOptions} from '../../shared/components/code-
2121
import {
2222
ElasticFilterDefaultTime
2323
} from '../../shared/components/utm/filters/elastic-filter-time/elastic-filter-time.component';
24-
import {UTM_CHART_ICONS} from '../../shared/constants/icons-chart.const';
2524
import {ALERT_INDEX_PATTERN, LOG_INDEX_PATTERN} from '../../shared/constants/main-index-pattern.constant';
2625
import {MULTIPLE_METRIC_CHART} from '../../shared/constants/visualization-bucket-metric.constant';
2726
import {ChartBuilderQueryLanguageEnum} from '../../shared/enums/chart-builder-query-language.enum';
@@ -92,6 +91,7 @@ export class ChartBuilderComponent implements OnInit, AfterViewChecked {
9291
private localFieldService: LocalFieldService,
9392
private sqlValidationService: SqlValidationService,
9493
private indexPatternService: IndexPatternService) {
94+
9595
route.queryParams.subscribe(params => {
9696
this.chart = params[VisualizationQueryParamsEnum.CHART];
9797
this.mode = params[VisualizationQueryParamsEnum.MODE];

frontend/src/app/shared/components/code-editor/code-editor.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ export class CodeEditorComponent implements OnInit, OnDestroy, ControlValueAcces
159159
}
160160

161161
clearMessages(): void {
162-
console.log('Query:', this.extractIndexPattern(this.sqlQuery));
162+
this.extractIndexPattern(this.sqlQuery);
163163
this.errorMessage = '';
164164
this.successMessage = '';
165165
}
@@ -200,13 +200,12 @@ export class CodeEditorComponent implements OnInit, OnDestroy, ControlValueAcces
200200
}
201201
}
202202

203-
const originalFragment = sql.substring(start, end).trim();
203+
const originalFragment = normalized.substring(start, end).trim();
204204

205205
if (originalFragment.length > 0) {
206206
const indexPatternSelected = this.customKeywords.find(keyword => keyword === originalFragment);
207207

208208
if (indexPatternSelected) {
209-
console.log(indexPatternSelected);
210209
this.indexPatternChange.emit(indexPatternSelected);
211210
}
212211
}

0 commit comments

Comments
 (0)