From 93582da044852ee2e69f25156abede5244fc4984 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 6 Jul 2018 12:49:06 -0400 Subject: [PATCH] collection and group listing from org admin --- jslib | 2 +- src/app/app.module.ts | 2 + .../manage/collections.component.html | 42 ++++++++++++++++++- .../manage/collections.component.ts | 37 +++++++++++++++- .../manage/groups.component.html | 42 ++++++++++++++++++- .../organizations/manage/groups.component.ts | 36 +++++++++++++++- .../vault/groupings.component.ts | 12 +----- src/locales/en/messages.json | 12 ++++++ 8 files changed, 168 insertions(+), 17 deletions(-) diff --git a/jslib b/jslib index a600c4a5398..2a526940fd4 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit a600c4a5398f8893d4cfea298fcfb66f90c3d975 +Subproject commit 2a526940fd4eefd2758ea654b0c7994e0ee12c4e diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 763ee9d9ff5..ac4d2b35064 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -109,6 +109,7 @@ import { TrueFalseValueDirective } from 'jslib/angular/directives/true-false-val import { I18nPipe } from 'jslib/angular/pipes/i18n.pipe'; import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe'; +import { SearchPipe } from 'jslib/angular/pipes/search.pipe'; @NgModule({ imports: [ @@ -189,6 +190,7 @@ import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe'; PurgeVaultComponent, RegisterComponent, SearchCiphersPipe, + SearchPipe, SettingsComponent, ShareComponent, StopClickDirective, diff --git a/src/app/organizations/manage/collections.component.html b/src/app/organizations/manage/collections.component.html index a3a5fcb7b29..9ff18013063 100644 --- a/src/app/organizations/manage/collections.component.html +++ b/src/app/organizations/manage/collections.component.html @@ -1,3 +1,43 @@ -
+

{{'collections' | i18n}}

+
+
+ + +
+ +
+ + +

{{'noItemsInList' | i18n}}

+ + + + + + + +
+ {{c.name}} + +
+ +
+ + + {{'users' | i18n}} + + + + {{'delete' | i18n}} + +
+
+
+ diff --git a/src/app/organizations/manage/collections.component.ts b/src/app/organizations/manage/collections.component.ts index a8396385603..c4ae19700dd 100644 --- a/src/app/organizations/manage/collections.component.ts +++ b/src/app/organizations/manage/collections.component.ts @@ -1,7 +1,40 @@ -import { Component } from '@angular/core'; +import { + Component, + OnInit, +} from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +import { ApiService } from 'jslib/abstractions/api.service'; +import { CollectionService } from 'jslib/abstractions/collection.service'; + +import { CollectionData } from 'jslib/models/data/collectionData'; +import { Collection } from 'jslib/models/domain/collection'; +import { CollectionView } from 'jslib/models/view/collectionView'; @Component({ selector: 'app-org-manage-collections', templateUrl: 'collections.component.html', }) -export class CollectionsComponent { } +export class CollectionsComponent implements OnInit { + loading = true; + organizationId: string; + collections: CollectionView[]; + searchText: string; + + constructor(private apiService: ApiService, private route: ActivatedRoute, + private collectionService: CollectionService) { } + + async ngOnInit() { + this.route.parent.parent.params.subscribe(async (params) => { + this.organizationId = params.organizationId; + }); + await this.load(); + } + + async load() { + const response = await this.apiService.getCollections(this.organizationId); + const collections = response.data.map((r) => new Collection(new CollectionData(r))); + this.collections = await this.collectionService.decryptMany(collections); + this.loading = false; + } +} diff --git a/src/app/organizations/manage/groups.component.html b/src/app/organizations/manage/groups.component.html index 672802b5b6e..4f1c0fc6b97 100644 --- a/src/app/organizations/manage/groups.component.html +++ b/src/app/organizations/manage/groups.component.html @@ -1,3 +1,43 @@ -
+

{{'groups' | i18n}}

+
+
+ + +
+ +
+ + +

{{'noItemsInList' | i18n}}

+ + + + + + + +
+ {{g.name}} + +
+ +
+ + + {{'users' | i18n}} + + + + {{'delete' | i18n}} + +
+
+
+ diff --git a/src/app/organizations/manage/groups.component.ts b/src/app/organizations/manage/groups.component.ts index f8140489e9f..824eb88ddb7 100644 --- a/src/app/organizations/manage/groups.component.ts +++ b/src/app/organizations/manage/groups.component.ts @@ -1,7 +1,39 @@ -import { Component } from '@angular/core'; +import { + Component, + OnInit, +} from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +import { ApiService } from 'jslib/abstractions/api.service'; + +import { GroupResponse } from 'jslib/models/response/groupUserResponse'; @Component({ selector: 'app-org-groups', templateUrl: 'groups.component.html', }) -export class GroupsComponent { } +export class GroupsComponent implements OnInit { + loading = true; + organizationId: string; + groups: GroupResponse[]; + searchText: string; + + constructor(private apiService: ApiService, private route: ActivatedRoute) { } + + async ngOnInit() { + this.route.parent.parent.params.subscribe(async (params) => { + this.organizationId = params.organizationId; + }); + await this.load(); + } + + async load() { + const response = await this.apiService.getGroups(this.organizationId); + if (response.data != null && response.data.length > 0) { + this.groups = response.data; + } else { + this.groups = []; + } + this.loading = false; + } +} diff --git a/src/app/organizations/vault/groupings.component.ts b/src/app/organizations/vault/groupings.component.ts index 6b7a4937e5b..d22dd327473 100644 --- a/src/app/organizations/vault/groupings.component.ts +++ b/src/app/organizations/vault/groupings.component.ts @@ -31,16 +31,8 @@ export class GroupingsComponent extends BaseGroupingsComponent { } const collections = await this.apiService.getCollections(this.organization.id); if (collections != null && collections.data != null && collections.data.length) { - const decCollections: CollectionView[] = []; - const promises: any[] = []; - collections.data.forEach((r) => { - const data = new CollectionData(r); - const collection = new Collection(data); - promises.push(collection.decrypt().then((c) => decCollections.push(c))); - }); - await Promise.all(promises); - decCollections.sort(this.collectionService.getLocaleSortingFunction()); - this.collections = decCollections; + const collectionDomains = collections.data.map((r) => new Collection(new CollectionData(r))); + this.collections = await this.collectionService.decryptMany(collectionDomains); } else { this.collections = []; } diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index df1731f7c37..693db6dd7cb 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -1699,5 +1699,17 @@ }, "groups": { "message": "Groups" + }, + "newGroup": { + "message": "New Group" + }, + "newCollection": { + "message": "New Collection" + }, + "inviteUser": { + "message": "Invite User" + }, + "search": { + "message": "Search" } }