diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/lib/utils/pretty_time.js | 9 | ||||
-rw-r--r-- | app/assets/javascripts/main.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/monitoring/prometheus_graph.js | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/javascripts/lib/utils/pretty_time.js b/app/assets/javascripts/lib/utils/pretty_time.js index ae397212e55..07d48d817c1 100644 --- a/app/assets/javascripts/lib/utils/pretty_time.js +++ b/app/assets/javascripts/lib/utils/pretty_time.js @@ -1,6 +1,9 @@ +import _map from 'lodash/map'; +import _reduce from 'lodash/reduce'; + (() => { /* - * TODO: Make these methods more configurable (e.g. parseSeconds timePeriodContstraints, + * TODO: Make these methods more configurable (e.g. parseSeconds timePeriodContstraints, * stringifyTime condensed or non-condensed, abbreviateTimelengths) * */ @@ -26,7 +29,7 @@ let unorderedMinutes = prettyTime.secondsToMinutes(seconds); - return _.mapObject(timePeriodConstraints, (minutesPerPeriod) => { + return _map(timePeriodConstraints, (minutesPerPeriod) => { const periodCount = Math.floor(unorderedMinutes / minutesPerPeriod); unorderedMinutes -= (periodCount * minutesPerPeriod); @@ -41,7 +44,7 @@ */ stringifyTime(timeObject) { - const reducedTime = _.reduce(timeObject, (memo, unitValue, unitName) => { + const reducedTime = _reduce(timeObject, (memo, unitValue, unitName) => { const isNonZero = !!unitValue; return isNonZero ? `${memo} ${unitValue}${unitName.charAt(0)}` : memo; }, '').trim(); diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 81d5748191d..c241aafeb8f 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -6,7 +6,7 @@ /* global Aside */ import jQuery from 'jquery'; -import _ from 'underscore'; +import _ from 'lodash'; import Cookies from 'js-cookie'; import Pikaday from 'pikaday'; import Dropzone from 'dropzone'; diff --git a/app/assets/javascripts/monitoring/prometheus_graph.js b/app/assets/javascripts/monitoring/prometheus_graph.js index 71eb746edac..442aea3c94f 100644 --- a/app/assets/javascripts/monitoring/prometheus_graph.js +++ b/app/assets/javascripts/monitoring/prometheus_graph.js @@ -2,7 +2,7 @@ /* global Flash */ import d3 from 'd3'; -import _ from 'underscore'; +import _ from 'lodash'; import statusCodes from '~/lib/utils/http_status'; import '~/lib/utils/common_utils'; import '~/flash'; |