diff --git a/app/scripts/controllers/create.js b/app/scripts/controllers/create.js index 4381a3af0f..322afb57a6 100644 --- a/app/scripts/controllers/create.js +++ b/app/scripts/controllers/create.js @@ -26,12 +26,6 @@ angular.module('openshiftConsole') $scope.alerts = $scope.alerts || {}; - $scope.breadcrumbs = [ - { - title: "Add to Project" - } - ]; - ProjectsService .get($routeParams.project) .then(_.spread(function(project, context) { diff --git a/app/scripts/controllers/create/browseCategory.js b/app/scripts/controllers/create/browseCategory.js index bbe07e1ba8..015320bead 100644 --- a/app/scripts/controllers/create/browseCategory.js +++ b/app/scripts/controllers/create/browseCategory.js @@ -59,28 +59,6 @@ angular.module('openshiftConsole') $scope.alerts = $scope.alerts || {}; - $scope.breadcrumbs = [ - { - title: "Add to Project", - link: "project/" + $scope.projectName + "/create" - }, - { - title: "Catalog", - link: "project/" + $scope.projectName + "/create?tab=fromCatalog" - } - ]; - - if (parentCategory) { - $scope.breadcrumbs.push({ - title: parentCategory.label, - link: "project/" + $scope.projectName + "/create/category/" + parentCategory.id - }); - } - - $scope.breadcrumbs.push({ - title: $scope.category.label - }); - ProjectsService .get($routeParams.project) .then(_.spread(function(project, context) { diff --git a/app/scripts/controllers/create/createFromImage.js b/app/scripts/controllers/create/createFromImage.js index 19782f4be3..2bb1b7af76 100644 --- a/app/scripts/controllers/create/createFromImage.js +++ b/app/scripts/controllers/create/createFromImage.js @@ -41,22 +41,8 @@ angular.module("openshiftConsole") return; } - var breadcrumbTitle = $routeParams.displayName || imageName; $scope.displayName = $routeParams.displayName; $scope.advancedOptions = $routeParams.advanced === 'true'; - $scope.breadcrumbs = [ - { - title: "Add to Project", - link: "project/" + $scope.projectName + "/create" - }, - { - title: "Catalog", - link: "project/" + $scope.projectName + "/create?tab=fromCatalog" - }, - { - title: breadcrumbTitle - } - ]; var appLabel = {name: 'app', value: ''}; @@ -324,8 +310,7 @@ angular.module("openshiftConsole") return d.promise; }); Navigate.toNextSteps($scope.name, $scope.projectName, { - usingSampleRepo: $scope.usingSampleRepo(), - breadcrumbTitle: breadcrumbTitle + usingSampleRepo: $scope.usingSampleRepo() }); }; diff --git a/app/scripts/controllers/create/nextSteps.js b/app/scripts/controllers/create/nextSteps.js index ff2f0ad83b..0f98c9a4f2 100644 --- a/app/scripts/controllers/create/nextSteps.js +++ b/app/scripts/controllers/create/nextSteps.js @@ -33,21 +33,7 @@ angular.module("openshiftConsole") $scope.projectName = $routeParams.project; $scope.fromSampleRepo = $routeParams.fromSample; - $scope.name = $routeParams.breadcrumbTitle || $routeParams.name; - - $scope.breadcrumbs = [ - { - title: "Add to Project", - link: "project/" + $scope.projectName + "/create" - }, - { - // Make history back the default by leaving off the link. - title: $routeParams.breadcrumbTitle || $routeParams.name - }, - { - title: "Next Steps" - } - ]; + $scope.name = $routeParams.name; ProjectsService .get($routeParams.project) diff --git a/app/scripts/controllers/newfromtemplate.js b/app/scripts/controllers/newfromtemplate.js index ee13502de3..c2a67656a9 100644 --- a/app/scripts/controllers/newfromtemplate.js +++ b/app/scripts/controllers/newfromtemplate.js @@ -34,20 +34,6 @@ angular.module('openshiftConsole') return; } - $scope.breadcrumbs = [ - { - title: "Add to Project", - link: "project/" + $routeParams.project + "/create" - }, - { - title: "Catalog", - link: "project/" + $routeParams.project + "/create?tab=fromCatalog" - }, - { - title: name - } - ]; - var getValidTemplateParamsMap = function() { try { return JSON.parse($routeParams.templateParamsMap); @@ -195,7 +181,6 @@ angular.module('openshiftConsole') DataService.get("templates", name, {namespace: (namespace || $scope.project.metadata.name)}).then( function(template) { $scope.template = template; - $scope.breadcrumbs[2].title = $filter('displayName')(template); findTemplateImages(template); var imageUsesParameters = function(image) { return !_.isEmpty(image.usesParameters); diff --git a/app/views/create.html b/app/views/create.html index 6c17c98831..41f3217bed 100644 --- a/app/views/create.html +++ b/app/views/create.html @@ -1,11 +1,10 @@
- - +
- + Browse Catalog
- -
+
Loading...
diff --git a/app/views/create/next-steps.html b/app/views/create/next-steps.html index d7ef9d5186..38370d3521 100644 --- a/app/views/create/next-steps.html +++ b/app/views/create/next-steps.html @@ -1,8 +1,6 @@
-
- - +
-
diff --git a/app/views/newfromtemplate.html b/app/views/newfromtemplate.html index 4fe97f44d1..92f5a44ecc 100644 --- a/app/views/newfromtemplate.html +++ b/app/views/newfromtemplate.html @@ -3,8 +3,7 @@
- -
+
Loading...
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js index 24b5ddab1b..12bf4fc327 100644 --- a/dist/scripts/scripts.js +++ b/dist/scripts/scripts.js @@ -7853,19 +7853,8 @@ return !1; }), a; }, m = i.CATALOG_CATEGORIES, p = "none" === r.category ? "" : r.category; if (e.category = d(m, p), e.category) { -var f, g; -!r.subcategory || (f = e.category, p = "none" === r.subcategory ? "" : r.subcategory, g = _.get(e.category, "subcategories", []), e.category = d(g, p), e.category) ? (e.alerts = e.alerts || {}, e.breadcrumbs = [ { -title: "Add to Project", -link: "project/" + e.projectName + "/create" -}, { -title: "Catalog", -link: "project/" + e.projectName + "/create?tab=fromCatalog" -} ], f && e.breadcrumbs.push({ -title: f.label, -link: "project/" + e.projectName + "/create/category/" + f.id -}), e.breadcrumbs.push({ -title: e.category.label -}), u.get(r.project).then(_.spread(function(t, n) { +var f; +!r.subcategory || (e.category, p = "none" === r.subcategory ? "" : r.subcategory, f = _.get(e.category, "subcategories", []), e.category = d(f, p), e.category) ? (e.alerts = e.alerts || {}, u.get(r.project).then(_.spread(function(t, n) { e.project = t, e.context = n, s.list("imagestreams", { namespace: "openshift" }).then(function(t) { @@ -7890,25 +7879,16 @@ var k = t("displayName"), P = t("humanize"); e.projectName = r.project, e.sourceURLPattern = y; var j = r.imageStream; if (j) if (r.imageTag) { -var R = r.displayName || j; -e.displayName = r.displayName, e.advancedOptions = "true" === r.advanced, e.breadcrumbs = [ { -title: "Add to Project", -link: "project/" + e.projectName + "/create" -}, { -title: "Catalog", -link: "project/" + e.projectName + "/create?tab=fromCatalog" -}, { -title: R -} ]; -var I = { +e.displayName = r.displayName, e.advancedOptions = "true" === r.advanced; +var R = { name: "app", value: "" -}, E = t("orderByDisplayName"), T = t("getErrorDetails"), N = {}, D = function() { -g.hideNotification("create-builder-list-config-maps-error"), g.hideNotification("create-builder-list-secrets-error"), _.each(N, function(e) { +}, I = t("orderByDisplayName"), E = t("getErrorDetails"), T = {}, N = function() { +g.hideNotification("create-builder-list-config-maps-error"), g.hideNotification("create-builder-list-secrets-error"), _.each(T, function(e) { !e.id || "error" !== e.type && "warning" !== e.type || g.hideNotification(e.id); }); }; -e.$on("$destroy", D), v.get(r.project).then(_.spread(function(t, n) { +e.$on("$destroy", N), v.get(r.project).then(_.spread(function(t, n) { e.project = t, r.sourceURI && (e.sourceURIinParams = !0); var i = function() { e.hideCPU || (e.cpuProblems = d.validatePodLimits(e.limitRanges, "cpu", [ e.container ], t)), e.memoryProblems = d.validatePodLimits(e.limitRanges, "memory", [ e.container ], t); @@ -7924,7 +7904,7 @@ v = e.by("metadata.name"), m.log("quotas", v); }), c.list("appliedclusterresourcequotas", n).then(function(e) { y = e.by("metadata.name"), m.log("cluster quotas", y); }), e.$watch("scaling.autoscale", S), e.$watch("container", S, !0), e.$watch("name", function(e, t) { -I.value && I.value !== t || (I.value = e); +R.value && R.value !== t || (R.value = e); }), function(a) { a.name = r.name, a.imageName = j, a.imageTag = r.imageTag, a.namespace = r.namespace, a.buildConfig = { buildOnSourceChange: !0, @@ -7944,7 +7924,7 @@ deployOnConfigChange: !0 }, a.DCEnvVarsFromImage, a.DCEnvVarsFromUser = [], a.routing = { include: !0, portOptions: [] -}, a.labelArray = [ I ], a.annotations = {}, a.scaling = { +}, a.labelArray = [ R ], a.annotations = {}, a.scaling = { replicas: 1, autoscale: !1, autoscaleOptions: [ { @@ -7968,18 +7948,18 @@ var o = [], i = []; e.valueFromObjects = [], c.list("configmaps", n, null, { errorNotification: !1 }).then(function(t) { -o = E(t.by("metadata.name")), e.valueFromObjects = o.concat(i); +o = I(t.by("metadata.name")), e.valueFromObjects = o.concat(i); }, function(e) { 403 !== e.code && g.addNotification({ id: "create-builder-list-config-maps-error", type: "error", message: "Could not load config maps.", -details: T(e) +details: E(e) }); }), c.list("secrets", n, null, { errorNotification: !1 }).then(function(t) { -i = E(t.by("metadata.name")), e.valueFromObjects = i.concat(o); +i = I(t.by("metadata.name")), e.valueFromObjects = i.concat(o); var n = b.groupSecretsByType(t), a = _.mapValues(n, function(e) { return _.map(e, "metadata.name"); }); @@ -7991,7 +7971,7 @@ e.unshift(""); id: "create-builder-list-secrets-error", type: "error", message: "Could not load secrets.", -details: T(e) +details: E(e) }); }), c.get("imagestreams", a.imageName, { namespace: a.namespace || r.project @@ -8017,7 +7997,7 @@ f.toErrorPage("Cannot create from source: the specified image could not be retri f.toErrorPage("Cannot create from source: the specified image could not be retrieved."); }); }(e); -var A, $ = function() { +var D, A = function() { var t = { started: "Creating application " + e.name + " in project " + e.projectDisplayName(), success: "Created application " + e.name + " in project " + e.projectDisplayName(), @@ -8025,7 +8005,7 @@ failure: "Failed to create " + e.name + " in project " + e.projectDisplayName() }, o = {}; C.clear(), C.add(t, o, r.project, function() { var t = a.defer(); -return c.batch(A, n).then(function(n) { +return c.batch(D, n).then(function(n) { var a = [], r = !1; _.isEmpty(n.failure) ? a.push({ type: "success", @@ -8047,10 +8027,9 @@ hasErrors: r }); }), t.promise; }), f.toNextSteps(e.name, e.projectName, { -usingSampleRepo: e.usingSampleRepo(), -breadcrumbTitle: R +usingSampleRepo: e.usingSampleRepo() }); -}, B = function(e) { +}, $ = function(e) { o.open({ animation: !0, templateUrl: "views/modals/confirm.html", @@ -8066,26 +8045,26 @@ cancelButtonText: "Cancel" }; } } -}).result.then($); -}, L = function(t) { -D(), N = t.quotaAlerts || [], e.nameTaken || _.some(N, { +}).result.then(A); +}, B = function(t) { +N(), T = t.quotaAlerts || [], e.nameTaken || _.some(T, { type: "error" -}) ? (e.disableInputs = !1, _.each(N, function(e) { +}) ? (e.disableInputs = !1, _.each(T, function(e) { e.id = _.uniqueId("create-builder-alert-"), g.addNotification(e); -})) : _.isEmpty(N) ? $() : (B(N), e.disableInputs = !1); +})) : _.isEmpty(T) ? A() : ($(T), e.disableInputs = !1); }; e.projectDisplayName = function() { return k(this.project) || this.projectName; }, e.createApp = function() { -e.disableInputs = !0, D(), e.buildConfig.envVars = w.compactEntries(e.buildConfigEnvVars), e.deploymentConfig.envVars = w.compactEntries(e.DCEnvVarsFromUser), e.labels = w.mapEntries(w.compactEntries(e.labelArray)); +e.disableInputs = !0, N(), e.buildConfig.envVars = w.compactEntries(e.buildConfigEnvVars), e.deploymentConfig.envVars = w.compactEntries(e.DCEnvVarsFromUser), e.labels = w.mapEntries(w.compactEntries(e.labelArray)); var t = s.generate(e); -A = [], angular.forEach(t, function(e) { -null !== e && (m.debug("Generated resource definition:", e), A.push(e)); +D = [], angular.forEach(t, function(e) { +null !== e && (m.debug("Generated resource definition:", e), D.push(e)); }); -var a = s.ifResourcesDontExist(A, e.projectName), r = h.getLatestQuotaAlerts(A, n), o = function(t) { +var a = s.ifResourcesDontExist(D, e.projectName), r = h.getLatestQuotaAlerts(D, n), o = function(t) { return e.nameTaken = t.nameTaken, r; }; -a.then(o, o).then(L, L); +a.then(o, o).then(B, B); }; })), e.cancel = function() { f.toProjectOverview(e.projectName); @@ -8094,14 +8073,7 @@ f.toProjectOverview(e.projectName); } ]), angular.module("openshiftConsole").controller("NextStepsController", [ "$scope", "$http", "$routeParams", "DataService", "$q", "$location", "TaskList", "$parse", "Navigate", "Logger", "$filter", "imageObjectRefFilter", "failureObjectNameFilter", "ProjectsService", function(e, t, n, a, r, o, i, s, c, l, u, d, m, p) { u("displayName"); var f = []; -e.alerts = [], e.loginBaseUrl = a.openshiftAPIBaseUrl(), e.buildConfigs = {}, e.projectName = n.project, e.fromSampleRepo = n.fromSample, e.name = n.breadcrumbTitle || n.name, e.breadcrumbs = [ { -title: "Add to Project", -link: "project/" + e.projectName + "/create" -}, { -title: n.breadcrumbTitle || n.name -}, { -title: "Next Steps" -} ], p.get(n.project).then(_.spread(function(t, r) { +e.alerts = [], e.loginBaseUrl = a.openshiftAPIBaseUrl(), e.buildConfigs = {}, e.projectName = n.project, e.fromSampleRepo = n.fromSample, e.name = n.name, p.get(n.project).then(_.spread(function(t, r) { e.project = t, f.push(a.watch("buildconfigs", r, function(t) { e.buildConfigs = t.by("metadata.name"), e.createdBuildConfig = e.buildConfigs[n.name], l.log("buildconfigs (subscribe)", e.buildConfigs); })), e.$on("$destroy", function() { @@ -8168,15 +8140,6 @@ e[t.name] = t.value; } var v = a.template, h = a.namespace || "", y = n("spec.template.spec.containers"), b = n("spec.strategy.sourceStrategy.from || spec.strategy.dockerStrategy.from || spec.strategy.customStrategy.from"), C = n("spec.output.to"), S = e("imageObjectRef"); if (v) { -r.breadcrumbs = [ { -title: "Add to Project", -link: "project/" + a.project + "/create" -}, { -title: "Catalog", -link: "project/" + a.project + "/create?tab=fromCatalog" -}, { -title: v -} ]; a.templateParamsMap && (r.prefillParameters = function() { try { return JSON.parse(a.templateParamsMap); @@ -8190,14 +8153,14 @@ details: "The `templateParamsMap` URL parameter is not valid JSON. " + e } }()); var w = /\${([a-zA-Z0-9\_]+)}/g, k = []; -l.get(a.project).then(_.spread(function(n) { -if (r.project = n, h) i.get("templates", v, { +l.get(a.project).then(_.spread(function(e) { +if (r.project = e, h) i.get("templates", v, { namespace: h || r.project.metadata.name -}).then(function(t) { -r.template = t, r.breadcrumbs[2].title = e("displayName")(t), f(t); +}).then(function(e) { +r.template = e, f(e); _.some(k, function(e) { return !_.isEmpty(e.usesParameters); -}) ? (r.parameterDisplayNames = {}, _.each(t.parameters, function(e) { +}) ? (r.parameterDisplayNames = {}, _.each(e.parameters, function(e) { r.parameterDisplayNames[e.name] = e.displayName || e.name; }), r.$watch("template.parameters", _.debounce(function() { r.$apply(m); @@ -8208,11 +8171,11 @@ maxWait: 250 s.toErrorPage("Cannot create from template: the specified template could not be retrieved."); }); else { if (r.template = o.getTemplate(), _.isEmpty(r.template)) { -var a = URI("error").query({ +var n = URI("error").query({ error: "not_found", error_description: "Template wasn't found in cache." }).toString(); -t.url(a); +t.url(n); } o.clearTemplate(); } @@ -8320,9 +8283,7 @@ t.debug("LogoutController"), n.isLoggedIn() ? (t.debug("LogoutController, logged n.isLoggedIn() ? (t.debug("LogoutController, logout failed, still logged in"), e.logoutMessage = 'You could not be logged out. Return to the console.') : a.logout_uri ? (t.debug("LogoutController, logout completed, redirecting to AUTH_CFG.logout_uri", a.logout_uri), window.location.href = a.logout_uri) : (t.debug("LogoutController, logout completed, reloading the page"), window.location.reload(!1)); })) : a.logout_uri ? (t.debug("LogoutController, logout completed, redirecting to AUTH_CFG.logout_uri", a.logout_uri), e.logoutMessage = "Logging out...", window.location.href = a.logout_uri) : (t.debug("LogoutController, not logged in, logout complete"), e.logoutMessage = 'You are logged out. Return to the console.'); } ]), angular.module("openshiftConsole").controller("CreateController", [ "$scope", "$filter", "$location", "$q", "$routeParams", "$uibModal", "CatalogService", "Constants", "DataService", "LabelFilter", "Logger", "ProjectsService", function(e, t, n, a, r, o, i, s, c, l, u, d) { -e.projectName = r.project, e.categories = s.CATALOG_CATEGORIES, e.alerts = e.alerts || {}, e.breadcrumbs = [ { -title: "Add to Project" -} ], d.get(r.project).then(_.spread(function(t, n) { +e.projectName = r.project, e.categories = s.CATALOG_CATEGORIES, e.alerts = e.alerts || {}, d.get(r.project).then(_.spread(function(t, n) { e.project = t, e.context = n, c.list("imagestreams", { namespace: "openshift" }).then(function(t) { diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js index 6e74734874..bdaa0c136e 100644 --- a/dist/scripts/templates.js +++ b/dist/scripts/templates.js @@ -4753,11 +4753,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( "
\n" + "
\n" + "
\n" + - "\n" + - "\n" + + "\n" + "
\n" + "
\n" + - "\n" + + "\n" + "\n" + "Browse Catalog\n" + "\n" + @@ -4811,8 +4810,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( "
\n" + "
\n" + "
\n" + - "\n" + - "
\n" + + "
\n" + "Loading...\n" + "
\n" + "
\n" + @@ -5077,8 +5075,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( $templateCache.put('views/create/next-steps.html', "
\n" + "
\n" + - "
\n" + - "\n" + + "
\n" + "\n" + "
\n" + "
\n" + @@ -11479,8 +11476,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( "
\n" + "
\n" + "
\n" + - "\n" + - "
\n" + + "
\n" + "Loading...\n" + "
\n" + "
\n" +