Skip to content

Use BuildsService.sortBuilds for sorting #1370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 21, 2017
Merged

Use BuildsService.sortBuilds for sorting #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/scripts/controllers/buildConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ angular.module('openshiftConsole')
editor.$blockScrolling = Infinity;
};

var orderByDate = $filter('orderObjectsByDate');
var buildConfigForBuild = $filter('buildConfigForBuild');
var buildStrategy = $filter('buildStrategy');
var watches = [];
Expand Down Expand Up @@ -207,7 +206,7 @@ angular.module('openshiftConsole')
LabelFilter.setLabelSuggestions($scope.labelSuggestions);

// Sort now to avoid sorting on every digest loop.
$scope.orderedBuilds = orderByDate($scope.builds, true);
$scope.orderedBuilds = BuildsService.sortBuilds($scope.builds, true);
$scope.latestBuild = $scope.orderedBuilds.length ? $scope.orderedBuilds[0] : null;
},
// params object for filtering
Expand Down Expand Up @@ -238,7 +237,7 @@ angular.module('openshiftConsole')
// trigger a digest loop
$scope.$apply(function() {
$scope.builds = labelSelector.select($scope.unfilteredBuilds);
$scope.orderedBuilds = orderByDate($scope.builds, true);
$scope.orderedBuilds = BuildsService.sortBuilds($scope.builds, true);
$scope.latestBuild = $scope.orderedBuilds.length ? $scope.orderedBuilds[0] : null;
updateFilterWarning();
});
Expand Down
2 changes: 1 addition & 1 deletion app/views/browse/build-config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ <h2>No builds.</h2>
<tr><td colspan="3"><em>{{emptyMessage}}</em></td></tr>
</tbody>
<tbody ng-if="(builds | hashSize) > 0">
<tr ng-repeat="build in orderedBuilds">
<tr ng-repeat="build in orderedBuilds track by (build | uid)">
<td data-title="Build">
<!-- Build number and link -->
<span ng-if="build | annotation : 'buildNumber'">
Expand Down
30 changes: 15 additions & 15 deletions dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5654,11 +5654,11 @@ a.alerts[b.name] = b.data;
var b = a.getSession();
b.setOption("tabSize", 2), b.setOption("useSoftTabs", !0), a.$blockScrolling = 1 / 0;
};
var m, n = b("orderObjectsByDate"), o = b("buildConfigForBuild"), p = b("buildStrategy"), q = [], r = function(b) {
a.updatedBuildConfig = angular.copy(b), a.envVars = p(a.updatedBuildConfig).env || [];
var m, n = b("buildConfigForBuild"), o = b("buildStrategy"), p = [], q = function(b) {
a.updatedBuildConfig = angular.copy(b), a.envVars = o(a.updatedBuildConfig).env || [];
};
a.saveEnvVars = function() {
a.envVars = _.filter(a.envVars, "name"), p(a.updatedBuildConfig).env = l.compactEntries(angular.copy(a.envVars)), h.update("buildconfigs", c.buildconfig, a.updatedBuildConfig, m).then(function() {
a.envVars = _.filter(a.envVars, "name"), o(a.updatedBuildConfig).env = l.compactEntries(angular.copy(a.envVars)), h.update("buildconfigs", c.buildconfig, a.updatedBuildConfig, m).then(function() {
a.alerts.saveBCEnvVarsSuccess = {
type:"success",
message:a.buildConfigName + " was updated."
Expand All @@ -5671,25 +5671,25 @@ details:"Reason: " + b("getErrorDetails")(c)
};
});
}, a.clearEnvVarUpdates = function() {
r(a.buildConfig), a.forms.bcEnvVars.$setPristine();
q(a.buildConfig), a.forms.bcEnvVars.$setPristine();
};
var s, t = function(c, d) {
var r, s = function(c, d) {
a.loaded = !0, a.buildConfig = c, a.buildConfigPaused = f.isPaused(a.buildConfig), a.buildConfig.spec.source.images && (a.imageSources = a.buildConfig.spec.source.images, a.imageSourcesPaths = [], a.imageSources.forEach(function(c) {
a.imageSourcesPaths.push(b("destinationSourcePair")(c.paths));
}));
var i = _.get(p(c), "from", {}), j = i.kind + "/" + i.name + "/" + (i.namespace || a.projectName);
s !== j && (_.includes([ "ImageStreamTag", "ImageStreamImage" ], i.kind) ? (s = j, h.get(e.kindToResource(i.kind), i.name, {
var i = _.get(o(c), "from", {}), j = i.kind + "/" + i.name + "/" + (i.namespace || a.projectName);
r !== j && (_.includes([ "ImageStreamTag", "ImageStreamImage" ], i.kind) ? (r = j, h.get(e.kindToResource(i.kind), i.name, {
namespace:i.namespace || a.projectName
}, {
errorNotification:!1
}).then(function(b) {
a.BCEnvVarsFromImage = g.getEnvironment(b);
}, function() {
a.BCEnvVarsFromImage = [];
})) :a.BCEnvVarsFromImage = []), r(c), "DELETED" === d && (a.alerts.deleted = {
})) :a.BCEnvVarsFromImage = []), q(c), "DELETED" === d && (a.alerts.deleted = {
type:"warning",
message:"This build configuration has been deleted."
}, a.buildConfigDeleted = !0), !a.forms.bcEnvVars || a.forms.bcEnvVars.$pristine ? r(c) :a.alerts.background_update = {
}, a.buildConfigDeleted = !0), !a.forms.bcEnvVars || a.forms.bcEnvVars.$pristine ? q(c) :a.alerts.background_update = {
type:"warning",
message:"This build configuration has been updated in the background. Saving your changes may create a conflict or cause loss of data.",
links:[ {
Expand All @@ -5708,16 +5708,16 @@ details:"The active filters are hiding all builds."
};
}
a.project = d, m = e, h.get("buildconfigs", c.buildconfig, e).then(function(a) {
t(a), q.push(h.watchObject("buildconfigs", c.buildconfig, e, t));
s(a), p.push(h.watchObject("buildconfigs", c.buildconfig, e, s));
}, function(c) {
a.loaded = !0, a.alerts.load = {
type:"error",
message:404 === c.status ? "This build configuration can not be found, it may have been deleted." :"The build configuration details could not be loaded.",
details:404 === c.status ? "Any remaining build history for this build will be shown." :"Reason: " + b("getErrorDetails")(c)
};
}), q.push(h.watch("builds", e, function(b, d, e) {
}), p.push(h.watch("builds", e, function(b, d, e) {
if (a.emptyMessage = "No builds to show", d) {
var h = o(e);
var h = n(e);
if (h === c.buildconfig) {
var j = e.metadata.name;
switch (d) {
Expand All @@ -5731,7 +5731,7 @@ delete a.unfilteredBuilds[j];
}
}
} else a.unfilteredBuilds = f.validatedBuildsForBuildConfig(c.buildconfig, b.by("metadata.name"));
a.builds = i.getLabelSelector().select(a.unfilteredBuilds), g(), i.addLabelSuggestionsFromResources(a.unfilteredBuilds, a.labelSuggestions), i.setLabelSuggestions(a.labelSuggestions), a.orderedBuilds = n(a.builds, !0), a.latestBuild = a.orderedBuilds.length ? a.orderedBuilds[0] :null;
a.builds = i.getLabelSelector().select(a.unfilteredBuilds), g(), i.addLabelSuggestionsFromResources(a.unfilteredBuilds, a.labelSuggestions), i.setLabelSuggestions(a.labelSuggestions), a.orderedBuilds = f.sortBuilds(a.builds, !0), a.latestBuild = a.orderedBuilds.length ? a.orderedBuilds[0] :null;
}, {
http:{
params:{
Expand All @@ -5743,7 +5743,7 @@ omission:""
}
})), i.onActiveFiltersChanged(function(b) {
a.$apply(function() {
a.builds = b.select(a.unfilteredBuilds), a.orderedBuilds = n(a.builds, !0), a.latestBuild = a.orderedBuilds.length ? a.orderedBuilds[0] :null, g();
a.builds = b.select(a.unfilteredBuilds), a.orderedBuilds = f.sortBuilds(a.builds, !0), a.latestBuild = a.orderedBuilds.length ? a.orderedBuilds[0] :null, g();
});
}), a.startBuild = function() {
f.startBuild(a.buildConfig.metadata.name, e).then(function(b) {
Expand All @@ -5761,7 +5761,7 @@ details:b("getErrorDetails")(c)
}, a.showJenkinsfileExamples = function() {
j.showJenkinsfileExamples();
}, a.$on("$destroy", function() {
h.unwatchAll(q);
h.unwatchAll(p);
});
}));
} ]), angular.module("openshiftConsole").controller("BuildController", [ "$scope", "$filter", "$routeParams", "BuildsService", "DataService", "ModalsService", "Navigate", "ProjectsService", function(a, b, c, d, e, f, g, h) {
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1908,7 +1908,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<tr><td colspan=\"3\"><em>{{emptyMessage}}</em></td></tr>\n" +
"</tbody>\n" +
"<tbody ng-if=\"(builds | hashSize) > 0\">\n" +
"<tr ng-repeat=\"build in orderedBuilds\">\n" +
"<tr ng-repeat=\"build in orderedBuilds track by (build | uid)\">\n" +
"<td data-title=\"Build\">\n" +
"\n" +
"<span ng-if=\"build | annotation : 'buildNumber'\">\n" +
Expand Down