From a083fc9084f8c6dde3fcb06c008edd7cde3a6c2c Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 27 Apr 2017 16:24:38 -0400 Subject: [PATCH] user vault collections changed to show all shared --- src/app/config.js | 10 +++--- .../views/organizationCollections.html | 2 +- .../views/organizationCollectionsAdd.html | 2 +- .../views/organizationCollectionsEdit.html | 2 +- .../organization/views/organizationVault.html | 4 +-- .../organizationVaultLoginCollections.html | 2 +- src/app/vault/vaultController.js | 4 +-- ...roller.js => vaultShareLoginController.js} | 6 ++-- ...Controller.js => vaultSharedController.js} | 30 ++++++++++++++--- src/app/vault/views/vault.html | 4 +-- .../vault/views/vaultLoginCollections.html | 2 +- .../{vaultShare.html => vaultShareLogin.html} | 5 +-- ...vaultCollections.html => vaultShared.html} | 32 +++++++++---------- src/app/views/organizationLayout.html | 2 +- src/app/views/userLayout.html | 8 ++--- src/index.html | 4 +-- 16 files changed, 71 insertions(+), 48 deletions(-) rename src/app/vault/{vaultShareController.js => vaultShareLoginController.js} (94%) rename src/app/vault/{vaultCollectionsController.js => vaultSharedController.js} (85%) rename src/app/vault/views/{vaultShare.html => vaultShareLogin.html} (95%) rename src/app/vault/views/{vaultCollections.html => vaultShared.html} (78%) diff --git a/src/app/config.js b/src/app/config.js index 8e90cd745e..5f2866740a 100644 --- a/src/app/config.js +++ b/src/app/config.js @@ -82,11 +82,11 @@ angular refreshFromServer: false } }) - .state('backend.user.collections', { - url: '^/collections', - templateUrl: 'app/vault/views/vaultCollections.html', - controller: 'vaultCollectionsController', - data: { pageTitle: 'Collections' } + .state('backend.user.shared', { + url: '^/shared', + templateUrl: 'app/vault/views/vaultShared.html', + controller: 'vaultSharedController', + data: { pageTitle: 'Shared' } }) .state('backend.user.settings', { url: '^/settings', diff --git a/src/app/organization/views/organizationCollections.html b/src/app/organization/views/organizationCollections.html index 4c7f1c731b..7957d3bf1b 100644 --- a/src/app/organization/views/organizationCollections.html +++ b/src/app/organization/views/organizationCollections.html @@ -1,7 +1,7 @@ 

Collections - share with your organization + control what you share

diff --git a/src/app/organization/views/organizationCollectionsAdd.html b/src/app/organization/views/organizationCollectionsAdd.html index a7991339a8..bb483cad30 100644 --- a/src/app/organization/views/organizationCollectionsAdd.html +++ b/src/app/organization/views/organizationCollectionsAdd.html @@ -1,6 +1,6 @@ 
-

Add Collection

+

Add Collection

diff --git a/src/app/organization/views/organizationCollectionsEdit.html b/src/app/organization/views/organizationCollectionsEdit.html index 491639387f..41c732ef60 100644 --- a/src/app/organization/views/organizationCollectionsEdit.html +++ b/src/app/organization/views/organizationCollectionsEdit.html @@ -1,6 +1,6 @@ 
-

Edit Collection

+

Edit Collection

diff --git a/src/app/organization/views/organizationVault.html b/src/app/organization/views/organizationVault.html index 537dcbb568..3ef7ff3484 100644 --- a/src/app/organization/views/organizationVault.html +++ b/src/app/organization/views/organizationVault.html @@ -16,7 +16,7 @@ ng-show="collections.length && (!main.searchVaultText || collectionLogins.length)">

- + {{collection.name}}

@@ -48,7 +48,7 @@
  • - Collections + Collections
  • diff --git a/src/app/organization/views/organizationVaultLoginCollections.html b/src/app/organization/views/organizationVaultLoginCollections.html index 9dd9ee1850..1e7b861a13 100644 --- a/src/app/organization/views/organizationVaultLoginCollections.html +++ b/src/app/organization/views/organizationVaultLoginCollections.html @@ -1,6 +1,6 @@ 
    -

    Collections {{cipher.name}}

    +

    Collections {{cipher.name}}

    diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js index 73706033b0..8b3a45784c 100644 --- a/src/app/vault/vaultController.js +++ b/src/app/vault/vaultController.js @@ -252,8 +252,8 @@ $scope.share = function (login) { var modal = $uibModal.open({ animation: true, - templateUrl: 'app/vault/views/vaultShare.html', - controller: 'vaultShareController', + templateUrl: 'app/vault/views/vaultShareLogin.html', + controller: 'vaultShareLoginController', resolve: { loginId: function () { return login.id; } } diff --git a/src/app/vault/vaultShareController.js b/src/app/vault/vaultShareLoginController.js similarity index 94% rename from src/app/vault/vaultShareController.js rename to src/app/vault/vaultShareLoginController.js index db7d30ff0b..6c39721e7b 100644 --- a/src/app/vault/vaultShareController.js +++ b/src/app/vault/vaultShareLoginController.js @@ -1,9 +1,9 @@ angular .module('bit.vault') - .controller('vaultShareController', function ($scope, apiService, $uibModalInstance, authService, cipherService, + .controller('vaultShareLoginController', function ($scope, apiService, $uibModalInstance, authService, cipherService, loginId, $analytics, $state) { - $analytics.eventTrack('vaultShareController', { category: 'Modal' }); + $analytics.eventTrack('vaultShareLoginController', { category: 'Modal' }); $scope.model = {}; $scope.login = {}; $scope.collections = []; @@ -11,6 +11,7 @@ $scope.organizations = []; var organizationCollectionCounts = {}; $scope.loadingCollections = true; + $scope.loading = true; $scope.readOnly = false; apiService.logins.get({ id: loginId }).$promise.then(function (login) { @@ -21,6 +22,7 @@ return login.Edit; }).then(function (canEdit) { + $scope.loading = false; if (!canEdit) { return; } diff --git a/src/app/vault/vaultCollectionsController.js b/src/app/vault/vaultSharedController.js similarity index 85% rename from src/app/vault/vaultCollectionsController.js rename to src/app/vault/vaultSharedController.js index a554001853..9a614a5ced 100644 --- a/src/app/vault/vaultCollectionsController.js +++ b/src/app/vault/vaultSharedController.js @@ -1,7 +1,7 @@ angular .module('bit.vault') - .controller('vaultCollectionsController', function ($scope, apiService, cipherService, $analytics, $q, $localStorage, + .controller('vaultSharedController', function ($scope, apiService, cipherService, $analytics, $q, $localStorage, $uibModal, $filter, $rootScope) { $scope.logins = []; $scope.collections = []; @@ -31,6 +31,14 @@ } } + if (decLogins.length) { + $scope.collections.push({ + id: null, + name: 'Unassigned', + collapsed: $localStorage.collapsedCollections && 'unassigned' in $localStorage.collapsedCollections + }); + } + $scope.logins = decLogins; }).$promise; @@ -41,20 +49,34 @@ $scope.filterByCollection = function (collection) { return function (cipher) { + if (!cipher.collectionIds || !cipher.collectionIds.length) { + return collection.id === null; + } + return cipher.collectionIds.indexOf(collection.id) > -1; }; }; + $scope.collectionSort = function (item) { + if (!item.id) { + return ''; + } + + return item.name.toLowerCase(); + }; + $scope.collapseExpand = function (collection) { if (!$localStorage.collapsedCollections) { $localStorage.collapsedCollections = {}; } - if (collection.id in $localStorage.collapsedCollections) { - delete $localStorage.collapsedCollections[collection.id]; + var id = collection.id || 'unassigned'; + + if (id in $localStorage.collapsedCollections) { + delete $localStorage.collapsedCollections[id]; } else { - $localStorage.collapsedCollections[collection.id] = true; + $localStorage.collapsedCollections[id] = true; } }; diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html index 2523bc6fd8..6f11b06582 100644 --- a/src/app/vault/views/vault.html +++ b/src/app/vault/views/vault.html @@ -68,7 +68,7 @@
  • - Collections + Collections
  • @@ -155,7 +155,7 @@
  • - Collections + Collections
  • diff --git a/src/app/vault/views/vaultLoginCollections.html b/src/app/vault/views/vaultLoginCollections.html index 88c614a2d2..a22afefe3a 100644 --- a/src/app/vault/views/vaultLoginCollections.html +++ b/src/app/vault/views/vaultLoginCollections.html @@ -1,6 +1,6 @@ 
    -

    Collections {{login.name}}

    +

    Collections {{login.name}}

    diff --git a/src/app/vault/views/vaultShare.html b/src/app/vault/views/vaultShareLogin.html similarity index 95% rename from src/app/vault/views/vaultShare.html rename to src/app/vault/views/vaultShareLogin.html index f341bfcc08..02f8274faa 100644 --- a/src/app/vault/views/vaultShare.html +++ b/src/app/vault/views/vaultShareLogin.html @@ -11,14 +11,15 @@
  • {{e}}
    • -
    +

    Loading...

    +

    No Organizations

    You do not belong to any organizations. Organizations allow you to share logins with other bitwarden users.

    Create an Organization
    -
    +
    *