From 825b174007a6d56e04dfed73527ac16faaf3d03c Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Tue, 19 Oct 2021 08:08:15 -0500
Subject: [PATCH] Remove unnecessary fallbacks (#1245)

Web is in lock-step to server version. We do not need fallbacks
since we're sure the server version will support collection permissions split.

(cherry picked from commit 1de569e64d85182e7c0cf769defee5efebdaff16)
---
 .../manage/user-add-edit.component.html       | 28 ++-----------------
 .../manage/user-add-edit.component.ts         | 13 ---------
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/src/app/organizations/manage/user-add-edit.component.html b/src/app/organizations/manage/user-add-edit.component.html
index 0a751dc5..43b53f6f 100644
--- a/src/app/organizations/manage/user-add-edit.component.html
+++ b/src/app/organizations/manage/user-add-edit.component.html
@@ -80,20 +80,7 @@
                             <div class="mb-3">
                                 <label class="font-weight-bold mb-0">Manager Permissions</label>
                                 <hr class="my-0 mr-2" />
-                                <!-- Deprecated Sep 29 2021 -->
-                                <div class="form-group mb-0" *ngIf="fallbackToManageAssignedCollections">
-                                    <div class="form-check mt-1 form-check-block">
-                                        <input class="form-check-input" type="checkbox" name="manageAssignedCollections"
-                                            id="manageAssignedCollections"
-                                            [(ngModel)]="permissions.manageAssignedCollections">
-                                        <label class="form-check-label font-weight-normal"
-                                            for="manageAssignedCollections">
-                                            {{'manageAssignedCollections' | i18n}}
-                                        </label>
-                                    </div>
-                                </div>
-                                <!--  -->
-                                <app-nested-checkbox *ngIf="!fallbackToManageAssignedCollections" parentId="manageAssignedCollections"
+                                <app-nested-checkbox parentId="manageAssignedCollections"
                                     [checkboxes]="manageAssignedCollectionsCheckboxes">
                                 </app-nested-checkbox>
                             </div>
@@ -129,18 +116,7 @@
                                         </label>
                                     </div>
                                 </div>
-                                <!-- Deprecated 29 Sep 2021 -->
-                                <div class="form-group mb-0" *ngIf="fallbackToManageAllCollections">
-                                    <div class="form-check mt-1 form-check-block">
-                                        <input class="form-check-input" type="checkbox" name="manageAllCollections"
-                                            id="manageAllCollections" [(ngModel)]="permissions.manageAllCollections">
-                                        <label class="form-check-label font-weight-normal" for="manageAllCollections">
-                                            {{'manageAllCollections' | i18n}}
-                                        </label>
-                                    </div>
-                                </div>
-                                <!--  -->
-                                <app-nested-checkbox *ngIf="!fallbackToManageAllCollections" parentId="manageAllCollections"
+                                <app-nested-checkbox parentId="manageAllCollections"
                                     [checkboxes]="manageAllCollectionsCheckboxes">
                                 </app-nested-checkbox>
                                 <div class="form-group mb-0">
diff --git a/src/app/organizations/manage/user-add-edit.component.ts b/src/app/organizations/manage/user-add-edit.component.ts
index 35307e85..308ff8ea 100644
--- a/src/app/organizations/manage/user-add-edit.component.ts
+++ b/src/app/organizations/manage/user-add-edit.component.ts
@@ -79,19 +79,6 @@ export class UserAddEditComponent implements OnInit {
         },
     ];
 
-    get fallbackToManageAllCollections() {
-        return this.editMode &&
-            this.permissions.createNewCollections == null &&
-            this.permissions.editAnyCollection == null &&
-            this.permissions.deleteAnyCollection == null;
-    }
-
-    get fallbackToManageAssignedCollections() {
-        return this.editMode &&
-            this.permissions.editAssignedCollections == null &&
-            this.permissions.deleteAssignedCollections == null;
-    }
-
     get customUserTypeSelected(): boolean {
         return this.type === OrganizationUserType.Custom;
     }