Skip to content

Commit

Permalink
Bug 1415602: Fix next steps for deploy image
Browse files Browse the repository at this point in the history 
Don't try to calculate the previous URL for breadcrumbs. Instead, use
history back, which simplifies the next steps controller code and makes
it work from any page (including deploy image). This also fixes a bug
where the display name for the image stream was not preserved.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1415602
  • Loading branch information
@spadgett
spadgett committed Jan 23, 2017
1 parent 880fcfc commit bcff353
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 91 deletions.
8 changes: 6 additions & 2 deletions app/scripts/controllers/create/createFromImage.js
View file
Expand Up @@ -40,6 +40,7 @@ angular.module("openshiftConsole")
return;
}

var breadcrumbTitle = $routeParams.displayName || imageName;
$scope.displayName = $routeParams.displayName;
$scope.breadcrumbs = [
{
Expand All @@ -55,7 +56,7 @@ angular.module("openshiftConsole")
link: "project/" + $scope.projectName + "/create?tab=fromCatalog"
},
{
title: $routeParams.displayName || imageName
title: breadcrumbTitle
}
];
$scope.alerts = {};
Expand Down Expand Up @@ -288,7 +289,10 @@ angular.module("openshiftConsole")
};
}
);
Navigate.toNextSteps($scope.name, $scope.projectName, $scope.usingSampleRepo() ? {"fromSample": true} : null);
Navigate.toNextSteps($scope.name, $scope.projectName, {
usingSampleRepo: $scope.usingSampleRepo(),
breadcrumbTitle: breadcrumbTitle
});
};

var launchConfirmationDialog = function(alerts) {
Expand Down
41 changes: 10 additions & 31 deletions app/scripts/controllers/create/nextSteps.js
View file
Expand Up @@ -20,22 +20,8 @@ angular.module("openshiftConsole")
$scope.showParamsTable = false;

$scope.projectName = $routeParams.project;
var imageName = $routeParams.imageStream;
var imageTag = $routeParams.imageTag;
var namespace = $routeParams.namespace;
$scope.fromSampleRepo = $routeParams.fromSample;

var template = $routeParams.template;
var nameLink = "";
var name = "";
if (creatingFromImage()) {
nameLink = "project/" + $scope.projectName + "/create/fromimage?imageName=" + imageName + "&imageTag=" + imageTag + "&namespace=" + namespace + "&name=" + name;
name = imageName + ":" + imageTag;
} else if (creatingFromTemplate()) {
nameLink = "project/" + $scope.projectName + "/create/fromtemplate?template=" + template + "&namespace=" + namespace;
name = template;
}

$scope.breadcrumbs = [
{
title: $scope.projectName,
Expand All @@ -46,8 +32,8 @@ angular.module("openshiftConsole")
link: "project/" + $scope.projectName + "/create"
},
{
title: name,
link: nameLink
// Make history back the default by leaving off the link.
title: $routeParams.breadcrumbTitle || $routeParams.name
},
{
title: "Next Steps"
Expand All @@ -68,22 +54,23 @@ angular.module("openshiftConsole")
$scope.project = project;
// Update project breadcrumb with display name.
$scope.breadcrumbs[0].title = $filter('displayName')(project);
if (!name) {
Navigate.toProjectOverview($scope.projectName);
return;
}
watches.push(DataService.watch("buildconfigs", context, function(buildconfigs) {
$scope.buildConfigs = buildconfigs.by("metadata.name");
$scope.createdBuildConfig = $scope.buildConfigs[name];
$scope.createdBuildConfig = $scope.buildConfigs[$routeParams.name];
Logger.log("buildconfigs (subscribe)", $scope.buildConfigs);
}));

var hasBuildConfigTrigger = function(type) {
var triggers = _.get($scope, 'createdBuildConfig.spec.triggers', []);
return _.some(triggers, { type: type });
};

$scope.createdBuildConfigWithGitHubTrigger = function() {
return _.some(_.get($scope, 'createdBuildConfig.spec.triggers'), {type: 'GitHub'});
return hasBuildConfigTrigger('GitHub');
};

$scope.createdBuildConfigWithConfigChangeTrigger = function() {
return _.some(_.get($scope, 'createdBuildConfig.spec.triggers'), {type: 'ConfigChange'});
return hasBuildConfigTrigger('ConfigChange');
};

$scope.allTasksSuccessful = function(tasks) {
Expand Down Expand Up @@ -121,12 +108,4 @@ angular.module("openshiftConsole")
});

}));

function creatingFromTemplate() {
return template && namespace;
}

function creatingFromImage() {
return imageName && imageTag && namespace;
}
});
2 changes: 1 addition & 1 deletion app/scripts/controllers/newfromtemplate.js
View file
Expand Up @@ -281,7 +281,7 @@ angular.module('openshiftConsole')
);
return d.promise;
});
Navigate.toNextSteps($routeParams.name, $scope.projectName);
Navigate.toNextSteps(name, $scope.projectName);
};

var launchConfirmationDialog = function(alerts) {
Expand Down
9 changes: 6 additions & 3 deletions app/scripts/services/navigate.js
View file
Expand Up @@ -100,12 +100,15 @@ angular.module("openshiftConsole")
* @param {type} projectName the project name
* @returns {undefined}
*/
toNextSteps: function(name, projectName, searchPart){
var search = $location.search();
search.name = name;
toNextSteps: function(name, projectName, searchPart) {
var search = {
name: name
};

if (_.isObject(searchPart)) {
_.extend(search, searchPart);
}

$location.path("project/" + encodeURIComponent(projectName) + "/create/next").search(search);
},

Expand Down
104 changes: 50 additions & 54 deletions dist/scripts/scripts.js
View file
Expand Up @@ -2203,8 +2203,10 @@ namespace:a.metadata.namespace
return d.toString();
},
toNextSteps:function(b, c, d) {
var e = a.search();
e.name = b, _.isObject(d) && _.extend(e, d), a.path("project/" + encodeURIComponent(c) + "/create/next").search(e);
var e = {
name:b
};
_.isObject(d) && _.extend(e, d), a.path("project/" + encodeURIComponent(c) + "/create/next").search(e);
},
toPodsForDeployment:function(b) {
a.url("/project/" + b.metadata.namespace + "/browse/pods"), c(function() {
Expand Down Expand Up @@ -7990,6 +7992,7 @@ a.projectName = d.project, a.sourceURLPattern = u;
var y = d.imageStream;
if (!y) return void h.toErrorPage("Cannot create from source: a base image was not specified");
if (!d.imageTag) return void h.toErrorPage("Cannot create from source: a base image tag was not specified");
var z = d.displayName || y;
a.displayName = d.displayName, a.breadcrumbs = [ {
title:a.projectName,
link:"project/" + a.projectName
Expand All @@ -8000,9 +8003,9 @@ link:"project/" + a.projectName + "/create"
title:"Catalog",
link:"project/" + a.projectName + "/create?tab=fromCatalog"
}, {
title:d.displayName || y
title:z
} ], a.alerts = {}, a.quotaAlerts = {};
var z = {
var A = {
name:"app",
value:""
};
Expand All @@ -8026,7 +8029,7 @@ deployOnConfigChange:!0
}, b.DCEnvVarsFromImage, b.DCEnvVarsFromUser = [], b.routing = {
include:!0,
portOptions:[]
}, b.userDefinedLabels = [], b.systemLabels = [ z ], b.annotations = {}, b.scaling = {
}, b.userDefinedLabels = [], b.systemLabels = [ A ], b.annotations = {}, b.scaling = {
replicas:1,
autoscale:!1,
autoscaleOptions:[ {
Expand Down Expand Up @@ -8083,25 +8086,25 @@ a.hideCPU || (a.cpuProblems = j.validatePodLimits(a.limitRanges, "cpu", [ a.cont
f.list("limitranges", g, function(b) {
a.limitRanges = b.by("metadata.name"), 0 !== r("hashSize")(b) && a.$watch("container", s, !0);
});
var u, A, B = function() {
var u, B, C = function() {
return a.scaling.autoscale ? void (a.showCPURequestWarning = !l.hasCPURequest([ a.container ], a.limitRanges, e)) :void (a.showCPURequestWarning = !1);
};
f.list("resourcequotas", g, function(a) {
u = a.by("metadata.name"), b.log("quotas", u);
}), f.list("appliedclusterresourcequotas", g, function(a) {
A = a.by("metadata.name"), b.log("cluster quotas", A);
}), a.$watch("scaling.autoscale", B), a.$watch("container", B, !0), a.$watch("name", function(a) {
z.value = a;
B = a.by("metadata.name"), b.log("cluster quotas", B);
}), a.$watch("scaling.autoscale", C), a.$watch("container", C, !0), a.$watch("name", function(a) {
A.value = a;
}), q(a);
var C, D = function() {
var D, E = function() {
var b = {
started:"Creating application " + a.name + " in project " + a.projectDisplayName(),
success:"Created application " + a.name + " in project " + a.projectDisplayName(),
failure:"Failed to create " + a.name + " in project " + a.projectDisplayName()
}, e = {};
p.clear(), p.add(b, e, d.project, function() {
var b = c.defer();
return f.batch(C, g).then(function(c) {
return f.batch(D, g).then(function(c) {
var d = [], e = !1;
c.failure.length > 0 ? (e = !0, c.failure.forEach(function(a) {
d.push({
Expand All @@ -8128,10 +8131,11 @@ type:"error",
message:"An error occurred creating the application.",
details:"Status: " + b.status + ". " + b.data
};
}), h.toNextSteps(a.name, a.projectName, a.usingSampleRepo() ? {
fromSample:!0
} :null);
}, E = function(a) {
}), h.toNextSteps(a.name, a.projectName, {
usingSampleRepo:a.usingSampleRepo(),
breadcrumbTitle:z
});
}, F = function(a) {
var b = t.open({
animation:!0,
templateUrl:"views/modals/confirm.html",
Expand All @@ -8148,12 +8152,12 @@ cancelButtonText:"Cancel"
}
}
});
b.result.then(D);
}, F = function(b) {
b.result.then(E);
}, G = function(b) {
var c = b.quotaAlerts || [], d = _.filter(c, {
type:"error"
});
a.nameTaken || d.length ? (a.disableInputs = !1, a.quotaAlerts = c) :c.length ? (E(c), a.disableInputs = !1) :D();
a.nameTaken || d.length ? (a.disableInputs = !1, a.quotaAlerts = c) :c.length ? (F(c), a.disableInputs = !1) :E();
};
a.projectDisplayName = function() {
return w(this.project) || this.projectName;
Expand All @@ -8162,72 +8166,64 @@ a.disableInputs = !0, a.alerts = {}, a.buildConfig.envVars = v.mapEntries(v.comp
var c = v.mapEntries(v.compactEntries(a.userDefinedLabels)), d = v.mapEntries(v.compactEntries(a.systemLabels));
a.labels = _.extend(d, c);
var e = i.generate(a);
C = [], angular.forEach(e, function(a) {
null !== a && (b.debug("Generated resource definition:", a), C.push(a));
D = [], angular.forEach(e, function(a) {
null !== a && (b.debug("Generated resource definition:", a), D.push(a));
});
var f = i.ifResourcesDontExist(C, a.projectName), h = m.getLatestQuotaAlerts(C, g), j = function(b) {
var f = i.ifResourcesDontExist(D, a.projectName), h = m.getLatestQuotaAlerts(D, g), j = function(b) {
return a.nameTaken = b.nameTaken, h;
};
f.then(j, j).then(F, F);
f.then(j, j).then(G, G);
};
}));
} ]), angular.module("openshiftConsole").controller("NextStepsController", [ "$scope", "$http", "$routeParams", "DataService", "$q", "$location", "ProcessedTemplateService", "TaskList", "$parse", "Navigate", "Logger", "$filter", "imageObjectRefFilter", "failureObjectNameFilter", "ProjectsService", function(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) {
function p() {
return v && u;
}
function q() {
return s && t && u;
}
var r = (l("displayName"), []);
a.emptyMessage = "Loading...", a.alerts = [], a.loginBaseUrl = d.openshiftAPIBaseUrl(), a.buildConfigs = {}, a.showParamsTable = !1, a.projectName = c.project;
var s = c.imageStream, t = c.imageTag, u = c.namespace;
a.fromSampleRepo = c.fromSample;
var v = c.template, w = "", x = "";
q() ? (w = "project/" + a.projectName + "/create/fromimage?imageName=" + s + "&imageTag=" + t + "&namespace=" + u + "&name=" + x, x = s + ":" + t) :p() && (w = "project/" + a.projectName + "/create/fromtemplate?template=" + v + "&namespace=" + u, x = v), a.breadcrumbs = [ {
var p = (l("displayName"), []);
a.emptyMessage = "Loading...", a.alerts = [], a.loginBaseUrl = d.openshiftAPIBaseUrl(), a.buildConfigs = {}, a.showParamsTable = !1, a.projectName = c.project, a.fromSampleRepo = c.fromSample, a.breadcrumbs = [ {
title:a.projectName,
link:"project/" + a.projectName
}, {
title:"Add to Project",
link:"project/" + a.projectName + "/create"
}, {
title:x,
link:w
title:c.breadcrumbTitle || c.name
}, {
title:"Next Steps"
} ];
var y = g.getTemplateData();
a.parameters = y.params, _.each(a.parameters, function(a) {
var q = g.getTemplateData();
a.parameters = q.params, _.each(a.parameters, function(a) {
l("altTextForValueFrom")(a);
}), a.templateMessage = y.message, g.clearTemplateData(), o.get(c.project).then(_.spread(function(b, c) {
function e(a) {
}), a.templateMessage = q.message, g.clearTemplateData(), o.get(c.project).then(_.spread(function(b, e) {
function f(a) {
var b = [];
return angular.forEach(a, function(a) {
a.hasErrors && b.push(a);
}), b;
}
function f(a) {
function g(a) {
var b = [];
return angular.forEach(a, function(a) {
"completed" !== a.status && b.push(a);
}), b;
}
return a.project = b, a.breadcrumbs[0].title = l("displayName")(b), x ? (r.push(d.watch("buildconfigs", c, function(b) {
a.buildConfigs = b.by("metadata.name"), a.createdBuildConfig = a.buildConfigs[x], k.log("buildconfigs (subscribe)", a.buildConfigs);
})), a.createdBuildConfigWithGitHubTrigger = function() {
return _.some(_.get(a, "createdBuildConfig.spec.triggers"), {
type:"GitHub"
a.project = b, a.breadcrumbs[0].title = l("displayName")(b), p.push(d.watch("buildconfigs", e, function(b) {
a.buildConfigs = b.by("metadata.name"), a.createdBuildConfig = a.buildConfigs[c.name], k.log("buildconfigs (subscribe)", a.buildConfigs);
}));
var h = function(b) {
var c = _.get(a, "createdBuildConfig.spec.triggers", []);
return _.some(c, {
type:b
});
};
a.createdBuildConfigWithGitHubTrigger = function() {
return h("GitHub");
}, a.createdBuildConfigWithConfigChangeTrigger = function() {
return _.some(_.get(a, "createdBuildConfig.spec.triggers"), {
type:"ConfigChange"
});
return h("ConfigChange");
}, a.allTasksSuccessful = function(a) {
return !f(a).length && !e(a).length;
return !g(a).length && !f(a).length;
}, a.toggleParamsTable = function() {
a.showParamsTable = !0;
}, a.erroredTasks = e, a.pendingTasks = f, void a.$on("$destroy", function() {
d.unwatchAll(r);
})) :void j.toProjectOverview(a.projectName);
}, a.erroredTasks = f, a.pendingTasks = g, a.$on("$destroy", function() {
d.unwatchAll(p);
});
}));
} ]), angular.module("openshiftConsole").controller("NewFromTemplateController", [ "$scope", "$http", "$routeParams", "DataService", "ProcessedTemplateService", "AlertMessageService", "ProjectsService", "QuotaService", "$q", "$location", "TaskList", "$parse", "Navigate", "$filter", "$uibModal", "imageObjectRefFilter", "failureObjectNameFilter", "CachedTemplateService", "keyValueEditorUtils", "Constants", function(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) {
var u = c.template, v = c.namespace || "";
Expand Down Expand Up @@ -8387,7 +8383,7 @@ alerts:d,
hasErrors:e
});
}), b.promise;
}), m.toNextSteps(c.name, a.projectName);
}), m.toNextSteps(u, a.projectName);
}, K = function(a) {
var b = o.open({
animation:!0,
Expand Down

0 comments on commit bcff353

Please sign in to comment.