Preselect current project in 'Select from Project'

openshift · Oct 24, 2017 · 98d68d2 · 98d68d2
1 parent 0f2d9ba
commit 98d68d2
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
@@ -84,7 +84,8 @@
 
     ctrl.$onInit = function() {
       ctrl.loginBaseUrl = DataService.openshiftAPIBaseUrl();
-      ctrl.preSelectedProject = ctrl.selectedProject = ctrl.project;
+      ctrl.preSelectedProject = ctrl.templateProject = ctrl.project;
+      ctrl.templateProjectChange();
       listProjects();
 
       ctrl.projectEmptyState = {
@@ -137,7 +138,7 @@
     };
 
     $scope.$on('templateInstantiated', function(event, message) {
-      ctrl.selectedProject = message.project;
+      ctrl.templateProject = message.project;
       ctrl.currentStep = ctrl.resultsStep.label;
     });
 
@@ -168,8 +169,8 @@
     };
 
     ctrl.onProjectSelected = function(project) {
-      ctrl.selectedProject = project;
-      ctrl.configStep.valid = $scope.$ctrl.form.$valid && ctrl.selectedProject;
+      ctrl.templateProject = project;
+      ctrl.configStep.valid = $scope.$ctrl.form.$valid && ctrl.templateProject;
     };
 
     ctrl.templateSelected = function(template) {
@@ -268,7 +269,7 @@
       ctrl.resultsStep.allowed = ctrl.configStep.valid;
 
       validityWatcher = $scope.$watch("$ctrl.form.$valid", function(isValid) {
-        ctrl.configStep.valid = isValid && ctrl.selectedProject;
+        ctrl.configStep.valid = isValid && ctrl.templateProject;
         ctrl.resultsStep.allowed = isValid;
       });
     }

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.html b/app/views/directives/process-template.html
@@ -1,7 +1,7 @@
 <fieldset ng-if="$ctrl.template" ng-disabled="disableInputs">
   <ng-form name="$ctrl.templateForm">
     <template-options is-dialog="$ctrl.isDialog" parameters="$ctrl.template.parameters" expand="true" can-toggle="false">
-      <select-project ng-if="!$ctrl.project" on-project-selected="$ctrl.onProjectSelected" available-projects="$ctrl.availableProjects" selected-project="$ctrl.selectedProject" name-taken="$ctrl.projectNameTaken"></select-project>
+      <select-project ng-if="!$ctrl.project" on-project-selected="$ctrl.onProjectSelected" available-projects="$ctrl.availableProjects" selected-project="$ctrl.templateProject" name-taken="$ctrl.projectNameTaken"></select-project>
     </template-options>
     <label-editor
         labels="$ctrl.labels"

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -13216,7 +13216,7 @@ allowed: !0,
 allowClickNav: !0,
 onShow: function() {
 b.infoStep.selected = !1, b.selectStep.selected = !1, b.configStep.selected = !0, b.resultsStep.selected = !1, b.nextTitle = "Create", b.resultsStep.allowed = b.configStep.valid, y = e.$watch("$ctrl.form.$valid", function(e) {
-b.configStep.valid = e && b.selectedProject, b.resultsStep.allowed = e;
+b.configStep.valid = e && b.templateProject, b.resultsStep.allowed = e;
 });
 }
 }, b.resultsStep = {
@@ -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.templateProject = 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 = {
@@ -13255,7 +13255,7 @@ onFilterChange: g
 }, b.$onChanges = function(e) {
 e.template && b.template && (d(), 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")), e.useProjectTemplate && d();
 }, e.$on("templateInstantiated", function(e, t) {
-b.selectedProject = t.project, b.currentStep = b.resultsStep.label;
+b.templateProject = t.project, b.currentStep = b.resultsStep.label;
 }), b.$onDestroy = function() {
 m();
 }, b.next = function(e) {
@@ -13264,7 +13264,7 @@ return e.stepId === b.configStep.id ? (p(), !1) : e.stepId !== b.resultsStep.id
 var e = b.onDialogClosed();
 _.isFunction(e) && e();
 }, b.onProjectSelected = function(t) {
-b.selectedProject = t, b.configStep.valid = e.$ctrl.form.$valid && b.selectedProject;
+b.templateProject = t, b.configStep.valid = e.$ctrl.form.$valid && b.templateProject;
 }, 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() {

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>"
   );
 
@@ -9073,7 +9073,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<fieldset ng-if=\"$ctrl.template\" ng-disabled=\"disableInputs\">\n" +
     "<ng-form name=\"$ctrl.templateForm\">\n" +
     "<template-options is-dialog=\"$ctrl.isDialog\" parameters=\"$ctrl.template.parameters\" expand=\"true\" can-toggle=\"false\">\n" +
-    "<select-project ng-if=\"!$ctrl.project\" on-project-selected=\"$ctrl.onProjectSelected\" available-projects=\"$ctrl.availableProjects\" selected-project=\"$ctrl.selectedProject\" name-taken=\"$ctrl.projectNameTaken\"></select-project>\n" +
+    "<select-project ng-if=\"!$ctrl.project\" on-project-selected=\"$ctrl.onProjectSelected\" available-projects=\"$ctrl.availableProjects\" selected-project=\"$ctrl.templateProject\" name-taken=\"$ctrl.projectNameTaken\"></select-project>\n" +
     "</template-options>\n" +
     "<label-editor labels=\"$ctrl.labels\" expand=\"true\" can-toggle=\"false\" help-text=\"Each label is applied to each created resource.\">\n" +
     "</label-editor>\n" +