Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2BA3A200C5B for ; Tue, 14 Mar 2017 19:41:51 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2921F160B93; Tue, 14 Mar 2017 18:41:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 42AE5160B9F for ; Tue, 14 Mar 2017 19:41:49 +0100 (CET) Received: (qmail 15671 invoked by uid 500); 14 Mar 2017 18:41:47 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 14253 invoked by uid 99); 14 Mar 2017 18:41:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Mar 2017 18:41:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0C862F4B7D; Tue, 14 Mar 2017 18:41:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Tue, 14 Mar 2017 18:42:26 -0000 Message-Id: In-Reply-To: <203926ce69a94dd697e2f18598a229f4@git.apache.org> References: <203926ce69a94dd697e2f18598a229f4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [42/50] ambari git commit: AMBARI-20441. Alert Definition "Last Changed" field is shown incorrect if alert wan't triggered any time (onechiporenko) archived-at: Tue, 14 Mar 2017 18:41:51 -0000 AMBARI-20441. Alert Definition "Last Changed" field is shown incorrect if alert wan't triggered any time (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e2818c61 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e2818c61 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e2818c61 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: e2818c61c15ec703e15581ca149c27bbfb7c1909 Parents: 645407b Author: Oleg Nechiporenko Authored: Tue Mar 14 11:32:45 2017 +0200 Committer: Oleg Nechiporenko Committed: Tue Mar 14 11:32:45 2017 +0200 ---------------------------------------------------------------------- ambari-web/app/models/alerts/alert_definition.js | 3 ++- .../main/service/configs/component_actions_by_configs_test.js | 2 +- ambari-web/test/models/alerts/alert_definition_test.js | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e2818c61/ambari-web/app/models/alerts/alert_definition.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/alerts/alert_definition.js b/ambari-web/app/models/alerts/alert_definition.js index b55ef1b..09089e6 100644 --- a/ambari-web/app/models/alerts/alert_definition.js +++ b/ambari-web/app/models/alerts/alert_definition.js @@ -100,7 +100,8 @@ App.AlertDefinition = DS.Model.extend({ * @type {string} */ lastTriggeredFormatted: function () { - return dateUtils.dateFormat(this.get('lastTriggered')); + let lastTriggered = this.get('lastTriggered'); + return lastTriggered ? dateUtils.dateFormat(lastTriggered) : ''; }.property('lastTriggered'), /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e2818c61/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js b/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js index f987c52..9a73a9a 100644 --- a/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js +++ b/ambari-web/test/mixins/main/service/configs/component_actions_by_configs_test.js @@ -226,7 +226,7 @@ describe('App.ComponentActionsByConfigs', function () { name: 'common.batch.request_schedules', sender: mixin, data: { - intervalTimeSeconds: 1, + intervalTimeSeconds: 60, tolerateSize: 0, batches: [{}, {}] } http://git-wip-us.apache.org/repos/asf/ambari/blob/e2818c61/ambari-web/test/models/alerts/alert_definition_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/models/alerts/alert_definition_test.js b/ambari-web/test/models/alerts/alert_definition_test.js index 3d8b62d..26309ae 100644 --- a/ambari-web/test/models/alerts/alert_definition_test.js +++ b/ambari-web/test/models/alerts/alert_definition_test.js @@ -175,6 +175,13 @@ describe('App.AlertDefinition', function () { RECOVERY: 'glyphicon glyphicon-oil' }}); + describe('#lastTriggeredFormatted', function () { + it('should be empty', function () { + model.set('lastTriggered', 0); + expect(model.get('lastTriggeredFormatted')).to.be.equal(''); + }); + }); + describe('REOPEN', function () { describe('#getSortDefinitionsByStatus', function () {