You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ji...@apache.org on 2019/02/26 01:37:09 UTC
[incubator-pinot] branch master updated: [TE] frontend -
harleyjj/manage-alerts - fix display bugs in alerts list (#3882)
This is an automated email from the ASF dual-hosted git repository.
jihao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new e6cdea0 [TE] frontend - harleyjj/manage-alerts - fix display bugs in alerts list (#3882)
e6cdea0 is described below
commit e6cdea04530886cd3253f19cfedf7b15ed9895af
Author: Harley Jackson <ha...@gmail.com>
AuthorDate: Mon Feb 25 17:37:04 2019 -0800
[TE] frontend - harleyjj/manage-alerts - fix display bugs in alerts list (#3882)
1. Fixes pagination errors on manage/explore and manage/alerts
2. Displays dimensions in alerts list if present
---
.../app/pods/manage/alert/explore/controller.js | 12 ++++++++++--
.../app/pods/manage/alerts/index/controller.js | 14 ++++++++++++--
.../app/pods/manage/alerts/index/route.js | 10 +++++++++-
3 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/thirdeye/thirdeye-frontend/app/pods/manage/alert/explore/controller.js b/thirdeye/thirdeye-frontend/app/pods/manage/alert/explore/controller.js
index aa6c663..4c7c034 100644
--- a/thirdeye/thirdeye-frontend/app/pods/manage/alert/explore/controller.js
+++ b/thirdeye/thirdeye-frontend/app/pods/manage/alert/explore/controller.js
@@ -632,10 +632,18 @@ export default Controller.extend({
switch (page) {
case 'previous':
- newPage = --currentPage;
+ if (currentPage > 1) {
+ newPage = --currentPage;
+ } else {
+ newPage = currentPage;
+ }
break;
case 'next':
- newPage = ++currentPage;
+ if (currentPage < this.get('pagesNum')) {
+ newPage = ++currentPage;
+ } else {
+ newPage = currentPage;
+ }
break;
}
diff --git a/thirdeye/thirdeye-frontend/app/pods/manage/alerts/index/controller.js b/thirdeye/thirdeye-frontend/app/pods/manage/alerts/index/controller.js
index bd9b4fd..04575dc 100644
--- a/thirdeye/thirdeye-frontend/app/pods/manage/alerts/index/controller.js
+++ b/thirdeye/thirdeye-frontend/app/pods/manage/alerts/index/controller.js
@@ -428,6 +428,8 @@ export default Controller.extend({
resetFiltersLocal: moment().valueOf()
});
}
+ // Reset current page
+ set(this, 'currentPage', 1);
},
/**
@@ -463,10 +465,18 @@ export default Controller.extend({
switch (page) {
case 'previous':
- newPage = --currentPage;
+ if (currentPage > 1) {
+ newPage = --currentPage;
+ } else {
+ newPage = currentPage;
+ }
break;
case 'next':
- newPage = ++currentPage;
+ if (currentPage < this.get('pagesNum')) {
+ newPage = ++currentPage;
+ } else {
+ newPage = currentPage;
+ }
break;
}
diff --git a/thirdeye/thirdeye-frontend/app/pods/manage/alerts/index/route.js b/thirdeye/thirdeye-frontend/app/pods/manage/alerts/index/route.js
index 01d136f..61b8665 100644
--- a/thirdeye/thirdeye-frontend/app/pods/manage/alerts/index/route.js
+++ b/thirdeye/thirdeye-frontend/app/pods/manage/alerts/index/route.js
@@ -54,11 +54,19 @@ export default Route.extend({
// format Yaml configs
const yamlAlerts = model.detectionYaml;
for (let yamlAlert of yamlAlerts) {
+ let dimensions = '';
+ let dimensionsArray = yamlAlert.dimensionExploration ? yamlAlert.dimensionExploration.dimensions : null;
+ if (Array.isArray(dimensionsArray)) {
+ dimensionsArray.forEach(dim => {
+ dimensions = dimensions + `${dim}, `;
+ });
+ dimensions = dimensions.substring(0, dimensions.length-2);
+ }
Object.assign(yamlAlert, {
functionName: yamlAlert.detectionName,
collection: yamlAlert.dataset,
type: yamlAlert.pipelineType,
- exploreDimensions: yamlAlert.dimensions,
+ exploreDimensions: dimensions,
filters: this._formatYamlFilter(yamlAlert.filters),
isNewPipeline: true
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org