Skip to content

Commit

Permalink
Bug 1466676 - Refactor all lodash .finds to ES6 (#3623)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JonARea
JonARea authored and Cameron Dawson committed Jun 19, 2018
1 parent 68d635f commit 9b3ba71
Show file tree
Hide file tree
Showing 8 changed files with 145 additions and 151 deletions.
31 changes: 16 additions & 15 deletions ui/js/controllers/perf/alerts.js
View file
Expand Up @@ -22,7 +22,8 @@ perf.factory('PhBugs', [
fileBug: function (alertSummary) {
$http.get(getApiUrl(`/performance/bug-template/?framework=${alertSummary.framework}`)).then(function (response) {
const template = response.data[0];
const repo = _.find($rootScope.repos, { name: alertSummary.repository });
const repo = $rootScope.repos.find(repo =>
repo.name === alertSummary.repository);
const compiledText = $interpolate(template.text)({
revisionHref: repo.getPushLogHref(alertSummary.resultSetMetadata.revision),
alertHref: window.location.origin + '/perf.html#/alerts?id=' +
Expand Down Expand Up @@ -132,7 +133,7 @@ perf.controller(
related_summary_id: newId,
}).then(() => {
const summariesToUpdate = [alertSummary].concat(
_.find(allAlertSummaries, alertSummary =>
allAlertSummaries.find(alertSummary =>
alertSummary.id === newId) || []);
$q.all(summariesToUpdate.map(alertSummary => alertSummary.update(),
)).then(() => $uibModalInstance.close('downstreamed'));
Expand Down Expand Up @@ -168,7 +169,7 @@ perf.controller(
}).then(function () {
// FIXME: duplication with downstream alerts controller
const summariesToUpdate = [alertSummary].concat(
_.find(allAlertSummaries, alertSummary =>
allAlertSummaries.find(alertSummary =>
alertSummary.id === newId) || []);
$q.all(summariesToUpdate.map(alertSummary => alertSummary.update(),
)).then(() => $uibModalInstance.close('downstreamed'));
Expand Down Expand Up @@ -389,7 +390,7 @@ perf.controller('AlertsCtrl', [
// but other summaries affected by the change
const summariesToUpdate = [alertSummary].concat((
alertSummary.alerts.filter(alert => alert.selected).map(
alert => (_.find($scope.alertSummaries, alertSummary =>
alert => ($scope.alertSummaries.find(alertSummary =>
alertSummary.id === alert.related_summary_id) || []),
)).reduce((a, b) => [...a, ...b], []));

Expand Down Expand Up @@ -443,9 +444,9 @@ perf.controller('AlertsCtrl', [
resultSet.push_timestamp * 1000, thDateFormat);
// want at least 14 days worth of results for relative comparisons
const timeRange = phTimeRangeValues[repo] ? phTimeRangeValues[repo] : phDefaultTimeRangeValue;
resultSet.timeRange = Math.max(timeRange, _.find(
phTimeRanges.map(timeRange => timeRange.value),
(t => ((Date.now() / 1000.0) - resultSet.push_timestamp) < t)));
resultSet.timeRange = Math.max(timeRange,
phTimeRanges.map(timeRange => timeRange.value).find(
t => ((Date.now() / 1000.0) - resultSet.push_timestamp) < t));
resultSetToSummaryMap[repo][resultSet.id].forEach(
(summary) => {
if (summary.push_id === resultSet.id) {
Expand All @@ -461,8 +462,8 @@ perf.controller('AlertsCtrl', [
// for all complete summaries, fill in job and pushlog links
// and downstream summaries
alertSummaries.forEach((summary) => {
const repo = _.find($rootScope.repos,
{ name: summary.repository });
const repo = $rootScope.repos.find(repo =>
repo.name === summary.repository);

if (summary.prevResultSetMetadata &&
summary.resultSetMetadata) {
Expand Down Expand Up @@ -583,12 +584,12 @@ perf.controller('AlertsCtrl', [
$scope.optionCollectionMap = optionCollectionMap;
})]).then(function () {
$scope.filterOptions = {
status: _.find($scope.statuses, {
id: parseInt($stateParams.status),
}) || $scope.statuses[0],
framework: _.find($scope.frameworks, {
id: parseInt($stateParams.framework),
}) || $scope.frameworks[0],
status: $scope.statuses.find(status =>
status.id === parseInt($stateParams.status),
) || $scope.statuses[0],
framework: $scope.frameworks.find(fw =>
fw.id === parseInt($stateParams.framework),
) || $scope.frameworks[0],
filter: $stateParams.filter || '',
hideImprovements: $stateParams.hideImprovements !== undefined &&
parseInt($stateParams.hideImprovements),
Expand Down
48 changes: 24 additions & 24 deletions ui/js/controllers/perf/compare.js
View file
Expand Up @@ -30,12 +30,12 @@ perf.controller('CompareChooserCtrl', [
return defaultValue;
};

$scope.originalProject = _.find(projects, {
name: getParameter('originalProject', phCompareDefaultOriginalRepo),
}) || projects[0];
$scope.newProject = _.find(projects, {
name: getParameter('newProject', phCompareDefaultNewRepo),
}) || projects[0];
$scope.originalProject = projects.find(project =>
project.name === getParameter('originalProject', phCompareDefaultOriginalRepo),
) || projects[0];
$scope.newProject = projects.find(project =>
project.name === getParameter('newProject', phCompareDefaultNewRepo),
) || projects[0];

$scope.originalRevision = getParameter('originalRevision', '');
$scope.newRevision = getParameter('newRevision', '');
Expand Down Expand Up @@ -153,12 +153,12 @@ perf.controller('CompareResultsCtrl', [
$scope.newStddevVariance[platform] = { values: [], lowerIsBetter: true, frameworkID: $scope.filterOptions.framework.id };
}

const oldSig = _.find(Object.keys(rawResultsMap), function (sig) {
return rawResultsMap[sig].name === testName && rawResultsMap[sig].platform === platform;
});
const newSig = _.find(Object.keys(newRawResultsMap), function (sig) {
return newRawResultsMap[sig].name === testName && newRawResultsMap[sig].platform === platform;
});
const oldSig = Object.keys(rawResultsMap).find(sig =>
rawResultsMap[sig].name === testName && rawResultsMap[sig].platform === platform,
);
const newSig = Object.keys(newRawResultsMap).find(sig =>
newRawResultsMap[sig].name === testName && newRawResultsMap[sig].platform === platform,
);

const cmap = PhCompare.getCounterMap(testName, rawResultsMap[oldSig], newRawResultsMap[newSig]);
if (cmap.isEmpty) {
Expand Down Expand Up @@ -428,9 +428,9 @@ perf.controller('CompareResultsCtrl', [
}
}
$scope.filterOptions = {
framework: _.find($scope.frameworks, {
id: parseInt($stateParams.framework),
}) || $scope.frameworks[0],
framework: $scope.frameworks.find(fw =>
fw.id === parseInt($stateParams.framework),
) || $scope.frameworks[0],
filter: $stateParams.filter || '',
showOnlyImportant: Boolean($stateParams.showOnlyImportant !== undefined &&
parseInt($stateParams.showOnlyImportant)),
Expand All @@ -455,9 +455,9 @@ perf.controller('CompareResultsCtrl', [
verifyPromises.push(verifyRevision($scope.originalProject, $scope.originalRevision, 'original'));
} else {
$scope.timeRanges = phTimeRanges;
$scope.selectedTimeRange = _.find($scope.timeRanges, {
value: ($stateParams.selectedTimeRange) ? parseInt($stateParams.selectedTimeRange) : phCompareBaseLineDefaultTimeRange,
});
$scope.selectedTimeRange = $scope.timeRanges.find(timeRange =>
timeRange.value === ($stateParams.selectedTimeRange ? parseInt($stateParams.selectedTimeRange) : phCompareBaseLineDefaultTimeRange),
);
}
$q.all(verifyPromises).then(function () {
if ($scope.errors.length > 0) {
Expand Down Expand Up @@ -532,9 +532,9 @@ perf.controller('CompareSubtestResultsCtrl', [
let tempsig;
// If no data for a given platform, or test, display N/A in table
if (resultsMap) {
tempsig = _.find(Object.keys(resultsMap), function (sig) {
return resultsMap[sig].name === page;
});
tempsig = Object.keys(resultsMap).find(sig =>
resultsMap[sig].name === page,
);
} else {
tempsig = 'undefined';
resultsMap = {};
Expand Down Expand Up @@ -652,9 +652,9 @@ perf.controller('CompareSubtestResultsCtrl', [
verifyPromises.push(verifyRevision($scope.originalProject, $scope.originalRevision, 'original'));
} else {
$scope.timeRanges = phTimeRanges;
$scope.selectedTimeRange = _.find($scope.timeRanges, {
value: ($stateParams.selectedTimeRange) ? parseInt($stateParams.selectedTimeRange) : phCompareBaseLineDefaultTimeRange,
});
$scope.selectedTimeRange = $scope.timeRanges.find(timeRange =>
timeRange.value === ($stateParams.selectedTimeRange ? parseInt($stateParams.selectedTimeRange) : phCompareBaseLineDefaultTimeRange),
);
}

$q.all(verifyPromises).then(function () {
Expand Down
58 changes: 30 additions & 28 deletions ui/js/controllers/perf/dashboard.js
View file
Expand Up @@ -33,9 +33,9 @@ perf.controller('dashCtrl', [

$scope.dataLoading = true;
$scope.timeRanges = phTimeRanges;
$scope.selectedTimeRange = _.find($scope.timeRanges, {
value: ($stateParams.timerange) ? parseInt($stateParams.timerange) : defaultTimeRange,
});
$scope.selectedTimeRange = $scope.timeRanges.find(timeRange =>
timeRange.value === ($stateParams.timerange ? parseInt($stateParams.timerange) : defaultTimeRange),
);
$scope.revision = $stateParams.revision;
$scope.topic = $stateParams.topic;

Expand Down Expand Up @@ -104,7 +104,8 @@ perf.controller('dashCtrl', [

return PhSeries.getSeriesData($scope.selectedRepo.name, params).then(function (seriesData) {
_.forIn(seriesData, function (data, signature) {
const series = _.find(seriesChunk, { signature: signature });
const series = seriesChunk.find(series =>
series.signature === signature);
const type = (series.options.indexOf($scope.variantDataOpt) >= 0) ? 'variant' : 'base';
resultsMap[type][signature] = {
platform: series.platform,
Expand All @@ -121,14 +122,14 @@ perf.controller('dashCtrl', [
$scope.testList.forEach(function (testName) {
$scope.titles[testName] = testName;
$scope.platformList.forEach(function (platform) {
const baseSig = _.find(Object.keys(resultsMap.base), function (sig) {
return resultsMap.base[sig].name === testName &&
resultsMap.base[sig].platform === platform;
});
const variantSig = _.find(Object.keys(resultsMap.variant), function (sig) {
return resultsMap.variant[sig].name === testName &&
resultsMap.variant[sig].platform === platform;
});
const baseSig = Object.keys(resultsMap.base).find(sig =>
resultsMap.base[sig].name === testName &&
resultsMap.base[sig].platform === platform,
);
const variantSig = Object.keys(resultsMap.variant).find(sig =>
resultsMap.variant[sig].name === testName &&
resultsMap.variant[sig].platform === platform,
);
if (variantSig && baseSig) {
const cmap = PhCompare.getCounterMap(
testName, resultsMap.base[baseSig],
Expand Down Expand Up @@ -206,9 +207,9 @@ perf.controller('dashCtrl', [

ThRepositoryModel.load().then(function () {
$scope.projects = $rootScope.repos;
$scope.selectedRepo = _.find($scope.projects, {
name: $stateParams.repo ? $stateParams.repo : thDefaultRepo,
});
$scope.selectedRepo = $scope.projects.find(project =>
project.name === ($stateParams.repo ? $stateParams.repo : thDefaultRepo),
);

$scope.$watchGroup([
'filterOptions.filter',
Expand Down Expand Up @@ -247,9 +248,9 @@ perf.controller('dashSubtestCtrl', [

$scope.dataLoading = true;
$scope.timeRanges = phTimeRanges;
$scope.selectedTimeRange = _.find(phTimeRanges, {
value: ($stateParams.timerange) ? parseInt($stateParams.timerange) : defaultTimeRange,
});
$scope.selectedTimeRange = phTimeRanges.find(timeRange =>
timeRange.value === ($stateParams.timerange ? parseInt($stateParams.timerange) : defaultTimeRange),
);
$scope.revision = $stateParams.revision;
$scope.topic = $stateParams.topic;

Expand Down Expand Up @@ -306,7 +307,8 @@ perf.controller('dashSubtestCtrl', [
return PhSeries.getSeriesData(
$scope.selectedRepo.name, params).then(function (seriesData) {
_.forIn(seriesData, function (data, signature) {
const series = _.find(seriesList, { signature: signature });
const series = seriesList.find(series =>
series.signature === signature);
const type = (series.options.indexOf($scope.variantDataOpt) >= 0) ? 'variant' : 'base';
resultsMap[type][signature] = {
platform: series.platform,
Expand All @@ -321,12 +323,12 @@ perf.controller('dashSubtestCtrl', [
$scope.dataLoading = false;
const subtestNames = resultsMap.base.map(results => results.name);
subtestNames.forEach(function (subtestName) {
const baseSig = _.find(Object.keys(resultsMap.base), function (sig) {
return resultsMap.base[sig].name === subtestName;
});
const variantSig = _.find(Object.keys(resultsMap.variant), function (sig) {
return resultsMap.variant[sig].name === subtestName;
});
const baseSig = Object.keys(resultsMap.base).find(sig =>
resultsMap.base[sig].name === subtestName,
);
const variantSig = Object.keys(resultsMap.variant).find(sig =>
resultsMap.variant[sig].name === subtestName,
);
if (variantSig && baseSig) {
const cmap = PhCompare.getCounterMap(
subtestName, resultsMap.base[baseSig],
Expand Down Expand Up @@ -382,9 +384,9 @@ perf.controller('dashSubtestCtrl', [

ThRepositoryModel.load().then(function () {
$scope.projects = $rootScope.repos;
$scope.selectedRepo = _.find($scope.projects, {
name: $stateParams.repo ? $stateParams.repo : thDefaultRepo,
});
$scope.selectedRepo = $scope.projects.find(project =>
project.name === ($stateParams.repo ? $stateParams.repo : thDefaultRepo),
);

$scope.$watchGroup([
'filterOptions.filter',
Expand Down

0 comments on commit 9b3ba71

Please sign in to comment.