Preselect current project in 'Select from Project'

openshift · Oct 24, 2017 · 63f48c0 · 63f48c0
1 parent 0f2d9ba
commit 63f48c0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/app/scripts/directives/processTemplateDialog.js b/app/scripts/directives/processTemplateDialog.js
@@ -85,6 +85,7 @@
     ctrl.$onInit = function() {
       ctrl.loginBaseUrl = DataService.openshiftAPIBaseUrl();
       ctrl.preSelectedProject = ctrl.selectedProject = ctrl.project;
+      ctrl.templateProjectChange();
       listProjects();
 
       ctrl.projectEmptyState = {
@@ -184,7 +185,7 @@
     };
 
     ctrl.templateProjectChange = function () {
-      ctrl.templateProjectName = _.get(ctrl.templateProject, 'metadata.name');
+      ctrl.templateProjectName = _.get(ctrl.selectedProject, 'metadata.name');
 
       // Get the templates for the selected project
       ctrl.catalogItems = {};

diff --git a/app/views/directives/header/header.html b/app/views/directives/header/header.html
@@ -50,5 +50,5 @@
 <overlay-panel show-panel="ordering.panelName" handle-close="closeOrderingPanel">
   <deploy-image-dialog ng-if="ordering.panelName === 'deployImage'" project="currentProject" context="context" on-dialog-closed="closeOrderingPanel"></deploy-image-dialog>
   <from-file-dialog ng-if="ordering.panelName === 'fromFile'" project="currentProject" context="context" on-dialog-closed="closeOrderingPanel"></from-file-dialog>
-  <process-template-dialog ng-if="ordering.panelName === 'fromProject'" project="project" use-project-template="true" on-dialog-closed="closeOrderingPanel"></process-template-dialog>
+  <process-template-dialog ng-if="ordering.panelName === 'fromProject'" project="currentProject" use-project-template="true" on-dialog-closed="closeOrderingPanel"></process-template-dialog>
 </overlay-panel>
diff --git a/app/views/directives/process-template-dialog/process-template-select.html b/app/views/directives/process-template-dialog/process-template-select.html
@@ -4,7 +4,7 @@
       <h2>Select from Project</h2>
       <ui-select
         name="selectProject"
-        ng-model="$ctrl.templateProject"
+        ng-model="$ctrl.selectedProject"
         ng-change="$ctrl.templateProjectChange()"
         search-enabled="$ctrl.searchEnabled">
         <ui-select-match placeholder="Select a Project">
@@ -19,10 +19,10 @@ <h2>Select from Project</h2>
         </ui-select-choices>
       </ui-select>
     </div>
-    <pf-empty-state ng-if="!$ctrl.templateProject" config="$ctrl.projectEmptyState"></pf-empty-state>
-    <pf-empty-state ng-if="$ctrl.templateProject && !$ctrl.catalogItems.length" config="$ctrl.templatesEmptyState"></pf-empty-state>
+    <pf-empty-state ng-if="!$ctrl.selectedProject" config="$ctrl.projectEmptyState"></pf-empty-state>
+    <pf-empty-state ng-if="$ctrl.selectedProject && !$ctrl.catalogItems.length" config="$ctrl.templatesEmptyState"></pf-empty-state>
     <div class="services-view">
-      <div ng-if="$ctrl.templateProject && $ctrl.catalogItems.length" class="services-items">
+      <div ng-if="$ctrl.selectedProject && $ctrl.catalogItems.length" class="services-items">
         <pf-filter config="$ctrl.filterConfig" class="services-items-filter order-services-filter"></pf-filter>
         <a href="" class="services-item show-selection" ng-class="{'active': item === $ctrl.selectedTemplate}" ng-repeat="item in $ctrl.filteredItems track by item.resource.metadata.uid" ng-click="$ctrl.templateSelected(item)">
           <div ng-if="!item.imageUrl" class="services-item-icon">

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -13231,7 +13231,7 @@ onShow: function() {
 b.infoStep.selected = !1, b.selectStep.selected = !1, b.configStep.selected = !1, b.resultsStep.selected = !0, b.nextTitle = "Close", m(), b.wizardDone = !0;
 }
 }, b.$onInit = function() {
-b.loginBaseUrl = r.openshiftAPIBaseUrl(), b.preSelectedProject = b.selectedProject = b.project, h(), b.projectEmptyState = {
+b.loginBaseUrl = r.openshiftAPIBaseUrl(), b.preSelectedProject = b.selectedProject = b.project, b.templateProjectChange(), h(), b.projectEmptyState = {
 title: "No Project Selected",
 info: "Please select a project from the dropdown to load Templates from that project."
 }, b.templatesEmptyState = {
@@ -13268,7 +13268,7 @@ b.selectedProject = t, b.configStep.valid = e.$ctrl.form.$valid && b.selectedPro
 }, b.templateSelected = function(e) {
 b.selectedTemplate = e, b.template = _.get(e, "resource"), b.selectStep.valid = !!e, b.iconClass = l(), b.image = u(), b.docUrl = C(b.template, "openshift.io/documentation-url"), b.supportUrl = C(b.template, "openshift.io/support-url"), b.vendor = C(b.template, "openshift.io/provider-display-name");
 }, b.templateProjectChange = function() {
-b.templateProjectName = _.get(b.templateProject, "metadata.name"), b.catalogItems = {}, b.templateSelected(), a.getProjectCatalogItems(b.templateProjectName, !1, !0).then(_.spread(function(e, t) {
+b.templateProjectName = _.get(b.selectedProject, "metadata.name"), b.catalogItems = {}, b.templateSelected(), a.getProjectCatalogItems(b.templateProjectName, !1, !0).then(_.spread(function(e, t) {
 b.catalogItems = e, b.totalCount = b.catalogItems.length, g(), t && i.addNotification({
 type: "error",
 message: t

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -7306,7 +7306,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<overlay-panel show-panel=\"ordering.panelName\" handle-close=\"closeOrderingPanel\">\n" +
     "<deploy-image-dialog ng-if=\"ordering.panelName === 'deployImage'\" project=\"currentProject\" context=\"context\" on-dialog-closed=\"closeOrderingPanel\"></deploy-image-dialog>\n" +
     "<from-file-dialog ng-if=\"ordering.panelName === 'fromFile'\" project=\"currentProject\" context=\"context\" on-dialog-closed=\"closeOrderingPanel\"></from-file-dialog>\n" +
-    "<process-template-dialog ng-if=\"ordering.panelName === 'fromProject'\" project=\"project\" use-project-template=\"true\" on-dialog-closed=\"closeOrderingPanel\"></process-template-dialog>\n" +
+    "<process-template-dialog ng-if=\"ordering.panelName === 'fromProject'\" project=\"currentProject\" use-project-template=\"true\" on-dialog-closed=\"closeOrderingPanel\"></process-template-dialog>\n" +
     "</overlay-panel>"
   );
 
@@ -9033,7 +9033,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"config-top\">\n" +
     "<div class=\"select-project-for-template\">\n" +
     "<h2>Select from Project</h2>\n" +
-    "<ui-select name=\"selectProject\" ng-model=\"$ctrl.templateProject\" ng-change=\"$ctrl.templateProjectChange()\" search-enabled=\"$ctrl.searchEnabled\">\n" +
+    "<ui-select name=\"selectProject\" ng-model=\"$ctrl.selectedProject\" ng-change=\"$ctrl.templateProjectChange()\" search-enabled=\"$ctrl.searchEnabled\">\n" +
     "<ui-select-match placeholder=\"Select a Project\">\n" +
     "{{$select.selected | displayName}}\n" +
     "</ui-select-match>\n" +
@@ -9046,10 +9046,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</ui-select-choices>\n" +
     "</ui-select>\n" +
     "</div>\n" +
-    "<pf-empty-state ng-if=\"!$ctrl.templateProject\" config=\"$ctrl.projectEmptyState\"></pf-empty-state>\n" +
-    "<pf-empty-state ng-if=\"$ctrl.templateProject && !$ctrl.catalogItems.length\" config=\"$ctrl.templatesEmptyState\"></pf-empty-state>\n" +
+    "<pf-empty-state ng-if=\"!$ctrl.selectedProject\" config=\"$ctrl.projectEmptyState\"></pf-empty-state>\n" +
+    "<pf-empty-state ng-if=\"$ctrl.selectedProject && !$ctrl.catalogItems.length\" config=\"$ctrl.templatesEmptyState\"></pf-empty-state>\n" +
     "<div class=\"services-view\">\n" +
-    "<div ng-if=\"$ctrl.templateProject && $ctrl.catalogItems.length\" class=\"services-items\">\n" +
+    "<div ng-if=\"$ctrl.selectedProject && $ctrl.catalogItems.length\" class=\"services-items\">\n" +
     "<pf-filter config=\"$ctrl.filterConfig\" class=\"services-items-filter order-services-filter\"></pf-filter>\n" +
     "<a href=\"\" class=\"services-item show-selection\" ng-class=\"{'active': item === $ctrl.selectedTemplate}\" ng-repeat=\"item in $ctrl.filteredItems track by item.resource.metadata.uid\" ng-click=\"$ctrl.templateSelected(item)\">\n" +
     "<div ng-if=\"!item.imageUrl\" class=\"services-item-icon\">\n" +