Merge pull request #3038 from apinf/bugfix/resolve-conflict-with-master

resolve conflict with master

apinf_packages/dashboard/client/trend_helpers.js

@@ -0,0 +1,123 @@
+/* Copyright 2017 Apinf Oy
+ This file is covered by the EUPL license.
+ You may obtain a copy of the licence at
+ https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11 */
+
+// Meteor contributed packages import
+import { TAPi18n } from 'meteor/tap:i18n';
+
+export function arrowDirection (parameter, bucket) {
+  let positiveTrend = 'arrow-up';
+  let negativeTrend = 'arrow-down';
+  let comparison;
+
+  switch (parameter) {
+    case 'requests':
+      comparison = bucket.compareRequests;
+      break;
+
+    case 'time':
+      comparison = bucket.compareResponse;
+      positiveTrend = 'arrow-up_time';
+      negativeTrend = 'arrow-down_time';
+      break;
+
+    case 'users':
+      comparison = bucket.compareUsers;
+      break;
+
+    default:
+      comparison = 0;
+
+  }
+
+  // If there is no trend
+  if (comparison === 0) {
+    // Don't display an arrow indicating
+    return undefined;
+  }
+
+  // If there is a positive trend
+  if (comparison > 0) {
+    // Display a green up arrow or a green down for response time metric
+    return positiveTrend;
+  }
+
+  // If there is a negative trend
+  // Display a red down arrow or a red up for response time metric
+  return negativeTrend;
+}
+
+export function percentageValue (parameter, bucket) {
+  let comparison;
+
+  switch (parameter) {
+    case 'requests':
+      comparison = bucket.compareRequests;
+      break;
+    case 'time':
+      comparison = bucket.compareResponse;
+      break;
+    case 'users':
+      comparison = bucket.compareUsers;
+      break;
+    default:
+      comparison = 0;
+      break;
+  }
+
+  // Get absolute value of comparison
+  const percentage = Math.abs(comparison);
+
+  // Don't display 0%
+  return percentage > 0 ? `${percentage}%` : '';
+}
+
+export function calculateTrend (previous, current) {
+  // If values are equal
+  // then no up-down
+  if (previous === current) return 0;
+
+  // it is impossible to divide on 0
+  // If previous value is 0 then progress is up on 100%
+  if (previous === 0 || isNaN(previous)) return 100;
+
+  // If current value is 0 then progress is down on 100%
+  if (current === 0 || isNaN(current)) return -100;
+
+  return Math.round(((current / previous) - 1) * 100);
+}
+
+export function summaryComparing (parameter, bucket, timeframe) {
+  // Get a trend direction value
+  const direction = arrowDirection(parameter, bucket);
+  // Get percentage trend value
+  const percentages = percentageValue(parameter, bucket);
+  let trend;
+  let text = '';
+
+  // Make sure trend exists
+  if (direction && percentages) {
+    // If trend is positive
+    if (direction === 'arrow-up' || direction === 'arrow-down_time') {
+      // Metric is better
+      trend = TAPi18n.__('summaryComparing_trendDirection_higher');
+    } else {
+      // Otherwise metric is worse
+      trend = TAPi18n.__('summaryComparing_trendDirection_lower');
+    }
+
+    const params = { percentage: percentages, direction: trend, day: timeframe };
+    // If comparison with 1 day then it is "yesterday"
+    // typeof timeframe is string
+    if (timeframe === '1') {
+      text = TAPi18n.__('summaryComparing_displayTrendInfo_yesterday', params);
+    } else {
+      text = TAPi18n.__('summaryComparing_displayTrendInfo_days', params);
+    }
+  }
+
+  // Don't display any text if there is no trend
+  // Or display trend information
+  return text;
+}

tests/end-to-end/ui/03-user-creation.js

@@ -8,6 +8,7 @@ https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence
 // Discover chimp-js browser
 /* globals browser */
 
+/*
 import signUpPage from '../../page-objects/signup.page';
 import mainContent from '../../page-objects/main-content.page';
 import loginPlatformsPage from '../../page-objects/login-platforms.page';
@@ -50,3 +51,4 @@ describe('03 user creation', () => {
     mainContent.logOut();
   });
 });
+*/