From f7c75d6e0f2268cf5d97869aeddcf976c70a04f9 Mon Sep 17 00:00:00 2001 From: Jaydip Hirapara Date: Tue, 24 Nov 2020 23:02:39 +0530 Subject: [PATCH] Minor chaneges in monitor UI --- .../create-query/create-query.component.html | 37 ++++++------------- .../create-query/create-query.component.ts | 3 +- projects/abtesting/src/assets/i18n/en.json | 6 +-- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/projects/abtesting/src/app/features/dashboard/home/components/create-query/create-query.component.html b/projects/abtesting/src/app/features/dashboard/home/components/create-query/create-query.component.html index c9e23a45..a26fc15e 100644 --- a/projects/abtesting/src/app/features/dashboard/home/components/create-query/create-query.component.html +++ b/projects/abtesting/src/app/features/dashboard/home/components/create-query/create-query.component.html @@ -67,8 +67,8 @@ - - {{ 'query.form-data-filter-function.text' | translate | titlecase }} + + {{ 'query.form-comparison-function.text' | translate | titlecase }} {{ 'query.none-option.text' | translate }} - - + + {{ 'query.form-compare-value.text' | translate | titlecase }} + + + {{ value | titlecase }} + + - - - {{ 'query.form-compare-value.text' | translate | titlecase }} - - - {{ value | titlecase }} - - - -
diff --git a/projects/abtesting/src/app/features/dashboard/home/components/create-query/create-query.component.ts b/projects/abtesting/src/app/features/dashboard/home/components/create-query/create-query.component.ts index 976bfae2..97d6299f 100644 --- a/projects/abtesting/src/app/features/dashboard/home/components/create-query/create-query.component.ts +++ b/projects/abtesting/src/app/features/dashboard/home/components/create-query/create-query.component.ts @@ -31,7 +31,7 @@ export class CreateQueryComponent implements OnInit, OnDestroy { options: any[] = []; selectedNode = null; - controlTitles = ['Class', 'Key', 'Metric']; // Used to show different titles in grouped metrics + controlTitles = ['Type', 'ID', 'Metric']; // Used to show different titles in grouped metrics constructor( private analysisService: AnalysisService, @@ -126,6 +126,7 @@ export class CreateQueryComponent implements OnInit, OnDestroy { resetForm() { this.keys.clear(); this.queryForm.reset(); + this.queryForm.get('repeatedMeasure').setValue(REPEATED_MEASURE.mostRecent); this.options = [this.options[0]]; this.filteredOptions = []; this.keys.push(this.addKey()); diff --git a/projects/abtesting/src/assets/i18n/en.json b/projects/abtesting/src/assets/i18n/en.json index cc2e2e81..c47f1451 100755 --- a/projects/abtesting/src/assets/i18n/en.json +++ b/projects/abtesting/src/assets/i18n/en.json @@ -237,8 +237,8 @@ "query.metric.text": "METRIC", "query.table-name.text": "NAME", "query.query-name.text": "Name", - "query.form-data-filter-function.text": "Data Filter Function", - "query.form-compare-value.text": "Compare Value", + "query.form-comparison-function.text": "Comparison", + "query.form-compare-value.text": "Value", "query.table-experiment.text": "EXPERIMENT", "query.table-execute.text": "EXECUTE", "query.table-repeated-measure.text": "REPEATED MEASURE", @@ -254,7 +254,7 @@ "monitor.metrics-list.text": "MONITORED METRICS LIST", "monitor.simple-metric.text": "Simple Metric", "monitor.grouped-metric.text": "Grouped Metric", - "monitor.metric-creation.text": "Monitor Metric", + "monitor.metric-creation.text": "Monitored Metrics", "monitor.metric-mean.text": "Mean", "monitor.metric-earliest.text": "Earliest", "monitor.metric-most-recent.text": "Most recent",