Merge branch '196648-replace-_-with-lodash' into 'master'

[UPDATE] Replace underscore with lodash in app/assets/javascripts/lib

Closes #196648

See merge request gitlab-org/gitlab!25042

app/assets/javascripts/lib/utils/datetime_utility.js

 import $ from 'jquery';
-import _ from 'underscore';
+import { isString, mapValues, isNumber, reduce } from 'lodash';
 import * as timeago from 'timeago.js';
 import dateFormat from 'dateformat';
 import { languageCode, s__, __, n__ } from '../../locale';
@@ -79,7 +79,7 @@ export const getDayName = date =>
  * @returns {String}
  */
 export const formatDate = (datetime, format = 'mmm d, yyyy h:MMtt Z') => {
-  if (_.isString(datetime) && datetime.match(/\d+-\d+\d+ /)) {
+  if (isString(datetime) && datetime.match(/\d+-\d+\d+ /)) {
     throw new Error(__('Invalid date'));
   }
   return dateFormat(datetime, format);
@@ -497,7 +497,7 @@ export const parseSeconds = (
 
   let unorderedMinutes = Math.abs(seconds / SECONDS_PER_MINUTE);
 
-  return _.mapObject(timePeriodConstraints, minutesPerPeriod => {
+  return mapValues(timePeriodConstraints, minutesPerPeriod => {
     if (minutesPerPeriod === 0) {
       return 0;
     }
@@ -516,7 +516,7 @@ export const parseSeconds = (
  * If the 'fullNameFormat' param is passed it returns a non condensed string eg '1 week 3 days'
  */
 export const stringifyTime = (timeObject, fullNameFormat = false) => {
-  const reducedTime = _.reduce(
+  const reducedTime = reduce(
     timeObject,
     (memo, unitValue, unitName) => {
       const isNonZero = Boolean(unitValue);
@@ -642,7 +642,7 @@ export const dayAfter = date => new Date(newDate(date).setDate(date.getDate() +
  * @return {String} approximated time
  */
 export const approximateDuration = (seconds = 0) => {
-  if (!_.isNumber(seconds) || seconds < 0) {
+  if (!isNumber(seconds) || seconds < 0) {
     return '';
   }
 

app/assets/javascripts/lib/utils/highlight.js

 import fuzzaldrinPlus from 'fuzzaldrin-plus';
-import _ from 'underscore';
 import sanitize from 'sanitize-html';
 
 /**
@@ -17,11 +16,11 @@ import sanitize from 'sanitize-html';
  * @param {String} matchSuffix The string to insert at the end of a match
  */
 export default function highlight(string, match = '', matchPrefix = '<b>', matchSuffix = '</b>') {
-  if (_.isUndefined(string) || _.isNull(string)) {
+  if (!string) {
     return '';
   }
 
-  if (_.isUndefined(match) || _.isNull(match) || match === '') {
+  if (!match) {
     return string;
   }
 
@@ -34,7 +33,7 @@ export default function highlight(string, match = '', matchPrefix = '<b>', match
   return sanitizedValue
     .split('')
     .map((character, i) => {
-      if (_.contains(occurrences, i)) {
+      if (occurrences.includes(i)) {
         return `${matchPrefix}${character}${matchSuffix}`;
       }
 

app/assets/javascripts/lib/utils/text_utility.js

-import _ from 'underscore';
+import { isString } from 'lodash';
 
 /**
  * Adds a , to a string composed by numbers, at every 3 chars.
@@ -199,7 +199,7 @@ export const splitCamelCase = string =>
  *      i.e. "My Group / My Subgroup / My Project"
  */
 export const truncateNamespace = (string = '') => {
-  if (_.isNull(string) || !_.isString(string)) {
+  if (string === null || !isString(string)) {
     return '';
   }
 

changelogs/unreleased/196648-replace-_-with-lodash.yml

+---
+title: Replaced underscore with lodash for app/assets/javascripts/lib
+merge_request: 25042
+author: Shubham Pandey
+type: other