Merge pull request #2336 from jhadvig/sort

Automatic merge from submit-queue. Add grouping to Select from Project @spadgett PTAL Closes #2332
openshift · Oct 23, 2017 · 6ce98f4 · 6ce98f4
2 parents 3d44d1c + ae6972a
commit 6ce98f4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/app/scripts/directives/processTemplateDialog.js b/app/scripts/directives/processTemplateDialog.js
@@ -208,6 +208,15 @@
       }));
     };
 
+    // TODO: Update the select-project component in the origin-web-catalog to optionally
+    // disable creating new projects, so we can reuse it.
+    ctrl.groupChoicesBy = function (item) {
+      if (RecentlyViewedProjectsService.isRecentlyViewed(item.metadata.uid)) {
+        return "Recently Viewed";
+      }
+      return "Other Projects";
+    };
+
     function getIconClass() {
       var iconClass = _.get(ctrl, 'template.metadata.annotations.iconClass', 'fa fa-clone');
       return (iconClass.indexOf('icon-') !== -1) ? 'font-icon ' + iconClass : iconClass;

diff --git a/app/views/directives/process-template-dialog/process-template-select.html b/app/views/directives/process-template-dialog/process-template-select.html
@@ -10,7 +10,7 @@ <h2>Select from Project</h2>
         <ui-select-match placeholder="Select a Project">
           {{$select.selected | displayName}}
         </ui-select-match>
-        <ui-select-choices repeat="project in $ctrl.templateProjects | searchProjects : $select.search track by (project | uid)">
+        <ui-select-choices repeat="project in $ctrl.templateProjects | searchProjects : $select.search track by (project | uid)" group-by="$ctrl.groupChoicesBy">
           <span ng-bind-html="project | displayName | highlightKeywords : $select.search"></span>
           <span ng-if="project | displayName : true" class="small text-muted">
             <span ng-if="project.metadata.name">&ndash;</span>

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -13274,6 +13274,8 @@ type: "error",
 message: t
 });
 }));
+}, b.groupChoicesBy = function(e) {
+return c.isRecentlyViewed(e.metadata.uid) ? "Recently Viewed" : "Other Projects";
 };
 var w = function() {
 var e = _.reject(b.unfilteredProjects, "metadata.deletionTimestamp"), n = _.sortBy(e, t("displayName"));

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -9041,7 +9041,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<ui-select-match placeholder=\"Select a Project\">\n" +
     "{{$select.selected | displayName}}\n" +
     "</ui-select-match>\n" +
-    "<ui-select-choices repeat=\"project in $ctrl.templateProjects | searchProjects : $select.search track by (project | uid)\">\n" +
+    "<ui-select-choices repeat=\"project in $ctrl.templateProjects | searchProjects : $select.search track by (project | uid)\" group-by=\"$ctrl.groupChoicesBy\">\n" +
     "<span ng-bind-html=\"project | displayName | highlightKeywords : $select.search\"></span>\n" +
     "<span ng-if=\"project | displayName : true\" class=\"small text-muted\">\n" +
     "<span ng-if=\"project.metadata.name\">&ndash;</span>\n" +