Skip to content

Fix error editing build config to push to new tag #1424

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
Apr 17, 2017
Merged

Fix error editing build config to push to new tag #1424

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
39 changes: 25 additions & 14 deletions app/scripts/directives/istagSelect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@ angular.module("openshiftConsole")
// Check if the istag object contains data about namespace/imageStream/tag so the ui-select will be pre-populated with them
var shouldPrepopulate = _.get($scope, 'istag.namespace') && _.get($scope, 'istag.imageStream') && _.get($scope, 'istag.tagObject.tag');

var ensureStatusTags = function(imageStreams) {
// Make sure each image stream has a status tags array, even if empty.
_.each(imageStreams, function(imageStream) {
if (!_.get(imageStream, 'status.tags')) {
_.set(imageStream, 'status.tags', []);
}
});
};

var prepopulate = function(ns) {
$scope.isByNamespace[ns] = {};
$scope.isNamesByNamespace[ns] = [];
Expand All @@ -48,17 +57,22 @@ angular.module("openshiftConsole")
return;
}
DataService.list('imagestreams', { namespace: ns }, function(isData) {
$scope.isByNamespace[ns] = isData.by('metadata.name');
$scope.isNamesByNamespace[ns] = _.keys( $scope.isByNamespace[ns]).sort();
// Make a copy since we modify status tags and don't want to mutate objects that are cached.
var imageStreams = angular.copy(isData.by('metadata.name'));
ensureStatusTags(imageStreams);
$scope.isByNamespace[ns] = imageStreams;
$scope.isNamesByNamespace[ns] = _.keys(imageStreams).sort();

// Image stream is missing
if (!_.contains($scope.isNamesByNamespace[ns], $scope.istag.imageStream)) {
$scope.isNamesByNamespace[ns] = $scope.isNamesByNamespace[ns].concat($scope.istag.imageStream);
$scope.isByNamespace[ns][$scope.istag.imageStream] = {status: {}};
}
if (!$scope.isByNamespace[ns][$scope.istag.imageStream].status.tags) {
$scope.isByNamespace[ns][$scope.istag.imageStream].status = {tags: []};
$scope.isByNamespace[ns][$scope.istag.imageStream] = {
status: {
tags: {}
}
};
}

// Tag is missing
if (!_.find( $scope.isByNamespace[ns][$scope.istag.imageStream].status.tags, {tag: $scope.istag.tagObject.tag})) {
$scope.isByNamespace[ns][$scope.istag.imageStream].status.tags.push({tag: $scope.istag.tagObject.tag});
Expand Down Expand Up @@ -88,14 +102,11 @@ angular.module("openshiftConsole")
return;
}
DataService.list('imagestreams', { namespace: namespace }, function(isData) {
$scope.isByNamespace[namespace] = isData.by('metadata.name');

_.each(_.keys($scope.isByNamespace[namespace]), function(imageStream) {
if (!$scope.isByNamespace[namespace][imageStream].status.tags) {
$scope.isByNamespace[namespace][imageStream].status = { tags: []};
}
});
$scope.isNamesByNamespace[namespace] = _.keys($scope.isByNamespace[namespace]).sort();
// Make a copy since we modify status tags and don't want to mutate objects that are cached.
var imageStreams = angular.copy(isData.by('metadata.name'));
ensureStatusTags(imageStreams);
$scope.isByNamespace[namespace] = imageStreams;
$scope.isNamesByNamespace[namespace] = _.keys(imageStreams).sort();
});
});
});
Expand Down
30 changes: 16 additions & 14 deletions dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13855,14 +13855,19 @@ allowCustomTag:"="
templateUrl:"views/directives/istag-select.html",
controller:[ "$scope", function(b) {
b.isByNamespace = {}, b.isNamesByNamespace = {};
var c = _.get(b, "istag.namespace") && _.get(b, "istag.imageStream") && _.get(b, "istag.tagObject.tag"), d = function(c) {
var c = _.get(b, "istag.namespace") && _.get(b, "istag.imageStream") && _.get(b, "istag.tagObject.tag"), d = function(a) {
_.each(a, function(a) {
_.get(a, "status.tags") || _.set(a, "status.tags", []);
});
}, e = function(c) {
return b.isByNamespace[c] = {}, b.isNamesByNamespace[c] = [], _.contains(b.namespaces, c) ? void a.list("imagestreams", {
namespace:c
}, function(a) {
b.isByNamespace[c] = a.by("metadata.name"), b.isNamesByNamespace[c] = _.keys(b.isByNamespace[c]).sort(), _.contains(b.isNamesByNamespace[c], b.istag.imageStream) || (b.isNamesByNamespace[c] = b.isNamesByNamespace[c].concat(b.istag.imageStream), b.isByNamespace[c][b.istag.imageStream] = {
status:{}
}), b.isByNamespace[c][b.istag.imageStream].status.tags || (b.isByNamespace[c][b.istag.imageStream].status = {
tags:[]
var e = angular.copy(a.by("metadata.name"));
d(e), b.isByNamespace[c] = e, b.isNamesByNamespace[c] = _.keys(e).sort(), _.contains(b.isNamesByNamespace[c], b.istag.imageStream) || (b.isNamesByNamespace[c] = b.isNamesByNamespace[c].concat(b.istag.imageStream), b.isByNamespace[c][b.istag.imageStream] = {
status:{
tags:{}
}
}), _.find(b.isByNamespace[c][b.istag.imageStream].status.tags, {
tag:b.istag.tagObject.tag
}) || b.isByNamespace[c][b.istag.imageStream].status.tags.push({
Expand All @@ -13876,16 +13881,13 @@ tag:b.istag.tagObject.tag
}
}));
};
a.list("projects", {}, function(e) {
b.namespaces = _.keys(e.by("metadata.name")).sort(), b.includeSharedNamespace && (b.namespaces = _.uniq([ "openshift" ].concat(b.namespaces))), b.$watch("istag.namespace", function(e) {
if (e && !b.isByNamespace[e]) return c ? (d(e), void (c = !1)) :void a.list("imagestreams", {
namespace:e
a.list("projects", {}, function(f) {
b.namespaces = _.keys(f.by("metadata.name")).sort(), b.includeSharedNamespace && (b.namespaces = _.uniq([ "openshift" ].concat(b.namespaces))), b.$watch("istag.namespace", function(f) {
if (f && !b.isByNamespace[f]) return c ? (e(f), void (c = !1)) :void a.list("imagestreams", {
namespace:f
}, function(a) {
b.isByNamespace[e] = a.by("metadata.name"), _.each(_.keys(b.isByNamespace[e]), function(a) {
b.isByNamespace[e][a].status.tags || (b.isByNamespace[e][a].status = {
tags:[]
});
}), b.isNamesByNamespace[e] = _.keys(b.isByNamespace[e]).sort();
var c = angular.copy(a.by("metadata.name"));
d(c), b.isByNamespace[f] = c, b.isNamesByNamespace[f] = _.keys(c).sort();
});
});
}), b.getTags = function(a) {
Expand Down