Merge pull request #1109 from coreos-inc/commonlistgrid

Create a common repo-list-view control and use it everywhere

static/js/directives/ui/repo-list-grid.js

@@ -13,7 +13,8 @@ angular.module('quay').directive('repoListGrid', function () {
       starred: '=starred',
       namespace: '=namespace',
       starToggled: '&starToggled',
-      hideTitle: '=hideTitle'
+      hideTitle: '=hideTitle',
+      hideNamespaces: '=hideNamespaces'
     },
     controller: function($scope, $element, UserService) {
       $scope.isOrganization = function(namespace) {

static/js/directives/ui/repo-list-table.js

@@ -10,7 +10,8 @@ angular.module('quay').directive('repoListTable', function () {
     restrict: 'C',
     scope: {
       'repositoriesResources': '=repositoriesResources',
-      'namespaces': '=namespaces'
+      'namespaces': '=namespaces',
+      'starToggled': '&starToggled'
     },
     controller: function($scope, $element, $filter) {
       var orderBy = $filter('orderBy');
@@ -59,7 +60,7 @@ angular.module('quay').directive('repoListTable', function () {
       $scope.getAvatarData = function(namespace) {
         var found = {};
         $scope.namespaces.forEach(function(current) {
-          if (current.name == namespace) {
+          if (current.name == namespace || current.username == namespace) {
             found = current.avatar;
           }
         });

static/js/directives/ui/repo-list-view.js

@@ -0,0 +1,38 @@
+/**
+ * An element that displays a list (grid or table) of repositories.
+ */
+angular.module('quay').directive('repoListView', function () {
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/repo-list-view.html',
+    replace: false,
+    transclude: true,
+    restrict: 'C',
+    scope: {
+      namespaces: '=namespaces',
+      starredRepositories: '=starredRepositories',
+      starToggled: '&starToggled',
+    },
+    controller: function($scope, $element, CookieService) {
+      $scope.resources = [];
+      $scope.showAsList = CookieService.get('quay.repoview') == 'list';
+
+      $scope.$watch('namespaces', function(namespaces) {
+        if (!namespaces) { return; }
+
+        $scope.resources = [];
+        namespaces.forEach(function(namespace) {
+          if (namespace && namespace.repositories) {
+            $scope.resources.push(namespace.repositories);
+          }
+        });
+      }, true);
+
+      $scope.setShowAsList = function(value) {
+        $scope.showAsList = value;
+        CookieService.putPermanent('quay.repoview', value ? 'list' : 'grid');
+      };
+    }
+  };
+  return directiveDefinitionObject;
+});

static/js/pages/org-view.js

@@ -13,6 +13,7 @@
   function OrgViewCtrl($scope, $routeParams, $timeout, ApiService, UIService, AvatarService) {
     var orgname = $routeParams.orgname;
 
+    $scope.namespace = orgname;
     $scope.showLogsCounter = 0;
     $scope.showApplicationsCounter = 0;
     $scope.showInvoicesCounter = 0;
@@ -31,10 +32,12 @@
     var loadRepositories = function() {
       var options = {
         'namespace': orgname,
-        'public': true
+        'public': true,
+        'last_modified': true,
+        'popularity': true
       };
 
-      $scope.repositoriesResource = ApiService.listReposAsResource().withOptions(options).get(function(resp) {
+      $scope.organization.repositories = ApiService.listReposAsResource().withOptions(options).get(function(resp) {
         return resp.repositories;
       });
     };

static/js/pages/repo-list.js

@@ -11,14 +11,13 @@
   }]);
 
 
-  function RepoListCtrl($scope, $sanitize, $q, Restangular, UserService, ApiService, CookieService, Features) {
+  function RepoListCtrl($scope, $sanitize, $q, Restangular, UserService, ApiService, Features) {
     $scope.namespace = null;
     $scope.page = 1;
     $scope.publicPageCount = null;
     $scope.allRepositories = {};
     $scope.loading = true;
     $scope.resources = [];
-    $scope.showAsList = CookieService.get('quay.repoview') == 'list';
     $scope.Features = Features;
 
     // When loading the UserService, if the user is logged in, create a list of
@@ -46,11 +45,6 @@
       }
     });
 
-    $scope.setShowAsList = function(value) {
-      $scope.showAsList = value;
-      CookieService.putPermanent('quay.repoview', value ? 'list' : 'grid');
-    };
-
     $scope.isOrganization = function(namespace) {
       return !!UserService.getOrganization(namespace);
     };

static/js/pages/user-view.js

@@ -19,6 +19,7 @@
     $scope.changeEmailInfo = {};
     $scope.changePasswordInfo = {};
     $scope.hasSingleSignin = ExternalLoginService.hasSingleSignin();
+    $scope.context = {};
 
     UserService.updateUserIn($scope);
 
@@ -26,16 +27,18 @@
       var options = {
         'public': true,
         'namespace': username,
+        'last_modified': true,
+        'popularity': true
       };
 
-      $scope.repositoriesResource = ApiService.listReposAsResource().withOptions(options).get(function(resp) {
+      $scope.context.viewuser.repositories = ApiService.listReposAsResource().withOptions(options).get(function(resp) {
         return resp.repositories;
       });
     };
 
     var loadUser = function() {
       $scope.userResource = ApiService.getUserInformationAsResource({'username': username}).get(function(user) {
-        $scope.viewuser = user;
+        $scope.context.viewuser = user;
 
         // Load the repositories.
         $timeout(function() {