From 5b4e8ff1cd3bd4798633d3a3b5b5adf490d623db Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Tue, 13 Dec 2022 08:24:44 -0800
Subject: [PATCH] Fix strictTemplating warnings/error after merge with master

---
 apps/web/src/app/organizations/vault/vault.module.ts          | 2 ++
 .../vault-filter/components/organization-options.component.ts | 4 ++--
 .../vault/vault-filter/components/vault-filter.component.html | 2 +-
 .../vault/vault-filter/components/vault-filter.component.ts   | 2 +-
 .../shared/components/vault-filter-section.component.html     | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/app/organizations/vault/vault.module.ts b/apps/web/src/app/organizations/vault/vault.module.ts
index 9cd3b7a9ab3..d0f073a880d 100644
--- a/apps/web/src/app/organizations/vault/vault.module.ts
+++ b/apps/web/src/app/organizations/vault/vault.module.ts
@@ -3,6 +3,7 @@ import { NgModule } from "@angular/core";
 import { LooseComponentsModule } from "../../shared/loose-components.module";
 import { SharedModule } from "../../shared/shared.module";
 import { OrganizationBadgeModule } from "../../vault/organization-badge/organization-badge.module";
+import { PipesModule } from "../../vault/pipes/pipes.module";
 
 import { VaultFilterModule } from "./vault-filter/vault-filter.module";
 import { VaultItemsComponent } from "./vault-items.component";
@@ -16,6 +17,7 @@ import { VaultComponent } from "./vault.component";
     SharedModule,
     LooseComponentsModule,
     OrganizationBadgeModule,
+    PipesModule,
   ],
   declarations: [VaultComponent, VaultItemsComponent],
   exports: [VaultComponent],
diff --git a/apps/web/src/app/vault/vault-filter/components/organization-options.component.ts b/apps/web/src/app/vault/vault-filter/components/organization-options.component.ts
index 13df0a7099c..51799183880 100644
--- a/apps/web/src/app/vault/vault-filter/components/organization-options.component.ts
+++ b/apps/web/src/app/vault/vault-filter/components/organization-options.component.ts
@@ -30,7 +30,7 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
   private destroy$ = new Subject<void>();
 
   constructor(
-    @Inject(OptionsInput) private organization: OrganizationFilter,
+    @Inject(OptionsInput) protected organization: OrganizationFilter,
     private platformUtilsService: PlatformUtilsService,
     private i18nService: I18nService,
     private apiService: ApiService,
@@ -58,7 +58,7 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy {
     this.destroy$.complete();
   }
 
-  allowEnrollmentChanges(org: Organization): boolean {
+  allowEnrollmentChanges(org: OrganizationFilter): boolean {
     if (org.usePolicies && org.useResetPassword && org.hasPublicAndPrivateKeys) {
       const policy = this.policies.find((p) => p.organizationId === org.id);
       if (policy != null && policy.enabled) {
diff --git a/apps/web/src/app/vault/vault-filter/components/vault-filter.component.html b/apps/web/src/app/vault/vault-filter/components/vault-filter.component.html
index 247a7b0c40f..cd61551af21 100644
--- a/apps/web/src/app/vault/vault-filter/components/vault-filter.component.html
+++ b/apps/web/src/app/vault/vault-filter/components/vault-filter.component.html
@@ -21,7 +21,7 @@
         placeholder="{{ searchPlaceholder | i18n }}"
         id="search"
         class="form-control"
-        (input)="searchTextChanged($event.target.value)"
+        (input)="searchTextChanged($any($event.target).value)"
         autocomplete="off"
         appAutofocus
       />
diff --git a/apps/web/src/app/vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/app/vault/vault-filter/components/vault-filter.component.ts
index f0e988d8c37..4fb791ec4cb 100644
--- a/apps/web/src/app/vault/vault-filter/components/vault-filter.component.ts
+++ b/apps/web/src/app/vault/vault-filter/components/vault-filter.component.ts
@@ -36,7 +36,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
   @Output() activeFilterChanged = new EventEmitter<VaultFilter>();
   @Output() onSearchTextChanged = new EventEmitter<string>();
   @Output() onAddFolder = new EventEmitter<never>();
-  @Output() onEditFolder = new EventEmitter<FolderView>();
+  @Output() onEditFolder = new EventEmitter<FolderFilter>();
 
   isLoaded = false;
   searchText = "";
diff --git a/apps/web/src/app/vault/vault-filter/shared/components/vault-filter-section.component.html b/apps/web/src/app/vault/vault-filter/shared/components/vault-filter-section.component.html
index 364132a3cda..856ca38849f 100644
--- a/apps/web/src/app/vault/vault-filter/shared/components/vault-filter-section.component.html
+++ b/apps/web/src/app/vault/vault-filter/shared/components/vault-filter-section.component.html
@@ -74,7 +74,7 @@
           <button
             class="filter-button"
             appA11yTitle="{{ 'vault' | i18n }}: {{ f.node.name | i18n }}"
-            [ngClass]="{ 'disabled-organization': isOrganization && !f.node.enabled }"
+            [ngClass]="{ 'disabled-organization': isOrganizationFilter && !f.node.enabled }"
             (click)="onFilterSelect(f)"
           >
             <i
@@ -96,7 +96,7 @@
             <i
               *ngIf="isOrganizationFilter && !f.node.enabled"
               class="org-options bwi bwi-fw bwi-exclamation-triangle text-danger"
-              aria-label="{{ 'organizationIsDisabled' | i18n }}"
+              [attr.aria-label]="'organizationIsDisabled' | i18n"
               appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
             ></i
             ><ng-container *ngIf="optionsInfo && !f.node.hideOptions"