From a25f6dee73da809d763bd2b57acb4405191f5a62 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 30 Jul 2018 08:12:47 -0400
Subject: [PATCH] check group access on collection edit page

---
 .../manage/collection-add-edit.component.html | 78 ++++++++++---------
 .../manage/collection-add-edit.component.ts   | 15 +++-
 2 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/src/app/organizations/manage/collection-add-edit.component.html b/src/app/organizations/manage/collection-add-edit.component.html
index 9db9ca5a48..447c0d33a8 100644
--- a/src/app/organizations/manage/collection-add-edit.component.html
+++ b/src/app/organizations/manage/collection-add-edit.component.html
@@ -15,45 +15,47 @@
                     <label for="name">{{'name' | i18n}}</label>
                     <input id="name" class="form-control" type="text" name="Name" [(ngModel)]="name" required>
                 </div>
-                <h3 class="mt-4 d-flex mb-0">
-                    {{'groupAccess' | i18n}}
-                    <div class="ml-auto" *ngIf="groups && groups.length">
-                        <button type="button" (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
-                            {{'selectAll' | i18n}}
-                        </button>
-                        <button type="button" (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
-                            {{'unselectAll' | i18n}}
-                        </button>
+                <ng-container *ngIf="accessGroups">
+                    <h3 class="mt-4 d-flex mb-0">
+                        {{'groupAccess' | i18n}}
+                        <div class="ml-auto" *ngIf="groups && groups.length">
+                            <button type="button" (click)="selectAll(true)" class="btn btn-link btn-sm py-0">
+                                {{'selectAll' | i18n}}
+                            </button>
+                            <button type="button" (click)="selectAll(false)" class="btn btn-link btn-sm py-0">
+                                {{'unselectAll' | i18n}}
+                            </button>
+                        </div>
+                    </h3>
+                    <div *ngIf="!groups || !groups.length">
+                        {{'noGroupsInList' | i18n}}
                     </div>
-                </h3>
-                <div *ngIf="!groups || !groups.length">
-                    {{'noGroupsInList' | i18n}}
-                </div>
-                <table class="table table-hover table-list mb-0" *ngIf="groups && groups.length">
-                    <thead>
-                        <tr>
-                            <th>&nbsp;</th>
-                            <th>{{'name' | i18n}}</th>
-                            <th width="100" class="text-center">{{'readOnly' | i18n}}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr *ngFor="let g of groups; let i = index">
-                            <td class="table-list-checkbox" (click)="check(g)">
-                                <input type="checkbox" [(ngModel)]="g.checked" name="Groups[{{i}}].Checked" [disabled]="g.accessAll">
-                            </td>
-                            <td (click)="check(g)">
-                                <span appStopProp>
-                                    {{g.name}}
-                                    <i class="fa fa-th text-muted fa-fw" *ngIf="g.accessAll" title="This group can access all items"></i>
-                                </span>
-                            </td>
-                            <td class="text-center">
-                                <input type="checkbox" [(ngModel)]="g.readOnly" name="Groups[{{i}}].ReadOnly" [disabled]="!g.checked || g.accessAll">
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
+                    <table class="table table-hover table-list mb-0" *ngIf="groups && groups.length">
+                        <thead>
+                            <tr>
+                                <th>&nbsp;</th>
+                                <th>{{'name' | i18n}}</th>
+                                <th width="100" class="text-center">{{'readOnly' | i18n}}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr *ngFor="let g of groups; let i = index">
+                                <td class="table-list-checkbox" (click)="check(g)">
+                                    <input type="checkbox" [(ngModel)]="g.checked" name="Groups[{{i}}].Checked" [disabled]="g.accessAll">
+                                </td>
+                                <td (click)="check(g)">
+                                    <span appStopProp>
+                                        {{g.name}}
+                                        <i class="fa fa-th text-muted fa-fw" *ngIf="g.accessAll" title="This group can access all items"></i>
+                                    </span>
+                                </td>
+                                <td class="text-center">
+                                    <input type="checkbox" [(ngModel)]="g.readOnly" name="Groups[{{i}}].ReadOnly" [disabled]="!g.checked || g.accessAll">
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </ng-container>
             </div>
             <div class="modal-footer">
                 <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
diff --git a/src/app/organizations/manage/collection-add-edit.component.ts b/src/app/organizations/manage/collection-add-edit.component.ts
index c9482e3fc1..1eb70dd29d 100644
--- a/src/app/organizations/manage/collection-add-edit.component.ts
+++ b/src/app/organizations/manage/collection-add-edit.component.ts
@@ -13,6 +13,7 @@ import { ApiService } from 'jslib/abstractions/api.service';
 import { CryptoService } from 'jslib/abstractions/crypto.service';
 import { I18nService } from 'jslib/abstractions/i18n.service';
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
+import { UserService } from 'jslib/abstractions/user.service';
 
 import { CipherString } from 'jslib/models/domain/cipherString';
 import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey';
@@ -34,6 +35,7 @@ export class CollectionAddEditComponent implements OnInit {
 
     loading = true;
     editMode: boolean = false;
+    accessGroups: boolean = false;
     title: string;
     name: string;
     groups: GroupResponse[] = [];
@@ -44,12 +46,17 @@ export class CollectionAddEditComponent implements OnInit {
 
     constructor(private apiService: ApiService, private i18nService: I18nService,
         private analytics: Angulartics2, private toasterService: ToasterService,
-        private platformUtilsService: PlatformUtilsService, private cryptoService: CryptoService) { }
+        private platformUtilsService: PlatformUtilsService, private cryptoService: CryptoService,
+        private userService: UserService) { }
 
     async ngOnInit() {
+        const organization = await this.userService.getOrganization(this.organizationId);
+        this.accessGroups = organization.useGroups;
         this.editMode = this.loading = this.collectionId != null;
-        const groupsResponse = await this.apiService.getGroups(this.organizationId);
-        this.groups = groupsResponse.data.map((r) => r).sort(Utils.getSortFunction(this.i18nService, 'name'));
+        if (this.accessGroups) {
+            const groupsResponse = await this.apiService.getGroups(this.organizationId);
+            this.groups = groupsResponse.data.map((r) => r).sort(Utils.getSortFunction(this.i18nService, 'name'));
+        }
         this.orgKey = await this.cryptoService.getOrgKey(this.organizationId);
 
         if (this.editMode) {
@@ -58,7 +65,7 @@ export class CollectionAddEditComponent implements OnInit {
             try {
                 const collection = await this.apiService.getCollectionDetails(this.organizationId, this.collectionId);
                 this.name = await this.cryptoService.decryptToUtf8(new CipherString(collection.name), this.orgKey);
-                if (collection.groups != null && this.groups != null) {
+                if (collection.groups != null && this.groups.length > 0) {
                     collection.groups.forEach((s) => {
                         const group = this.groups.filter((g) => !g.accessAll && g.id === s.id);
                         if (group != null && group.length > 0) {