diff --git a/src/app/modules/vault-filter/organization-vault-filter.component.ts b/src/app/modules/vault-filter/organization-vault-filter.component.ts index 145e5b2e..4e0e8463 100644 --- a/src/app/modules/vault-filter/organization-vault-filter.component.ts +++ b/src/app/modules/vault-filter/organization-vault-filter.component.ts @@ -3,7 +3,6 @@ import { Component, Input } from "@angular/core"; import { Organization } from "jslib-common/models/domain/organization"; import { VaultFilterComponent } from "./vault-filter.component"; -import { VaultFilterServiceInterface } from "./vault-filter.service.interface"; @Component({ selector: "app-organization-vault-filter", @@ -16,10 +15,6 @@ export class OrganizationVaultFilterComponent extends VaultFilterComponent { organization: Organization; - constructor(protected vaultFilterService: VaultFilterServiceInterface) { - super(vaultFilterService); - } - async initCollections() { if (this.organization.canEditAnyCollection) { return await this.vaultFilterService.buildAdminCollections(this.organization.id); diff --git a/src/app/modules/vault-filter/vault-filter.component.ts b/src/app/modules/vault-filter/vault-filter.component.ts index 0e0878c7..9fc79948 100644 --- a/src/app/modules/vault-filter/vault-filter.component.ts +++ b/src/app/modules/vault-filter/vault-filter.component.ts @@ -2,6 +2,8 @@ import { Component, EventEmitter, Output } from "@angular/core"; import { VaultFilterComponent as BaseVaultFilterComponent } from "jslib-angular/modules/vault-filter/vault-filter.component"; +import { VaultFilterService } from "./vault-filter.service"; + @Component({ selector: "app-vault-filter", templateUrl: "vault-filter.component.html", @@ -12,6 +14,10 @@ export class VaultFilterComponent extends BaseVaultFilterComponent { searchPlaceholder: string; searchText = ""; + constructor(protected vaultFilterService: VaultFilterService) { + super(vaultFilterService); + } + searchTextChanged() { this.onSearchTextChanged.emit(this.searchText); } diff --git a/src/app/modules/vault-filter/vault-filter.module.ts b/src/app/modules/vault-filter/vault-filter.module.ts index 8693b040..1ec6c5d7 100644 --- a/src/app/modules/vault-filter/vault-filter.module.ts +++ b/src/app/modules/vault-filter/vault-filter.module.ts @@ -1,7 +1,5 @@ import { NgModule } from "@angular/core"; -import { VaultFilterServiceInterface as BaseVaultFilterServiceInterface } from "jslib-angular/modules/vault-filter/vault-filter.service.interface"; - import { SharedModule } from "../shared.module"; import { CollectionFilterComponent } from "./components/collection-filter.component"; @@ -14,7 +12,6 @@ import { TypeFilterComponent } from "./components/type-filter.component"; import { OrganizationVaultFilterComponent } from "./organization-vault-filter.component"; import { VaultFilterComponent } from "./vault-filter.component"; import { VaultFilterService } from "./vault-filter.service"; -import { VaultFilterServiceInterface } from "./vault-filter.service.interface"; @NgModule({ imports: [SharedModule], @@ -30,15 +27,6 @@ import { VaultFilterServiceInterface } from "./vault-filter.service.interface"; LinkSsoComponent, ], exports: [VaultFilterComponent, OrganizationVaultFilterComponent], - providers: [ - { - provide: VaultFilterServiceInterface, - useClass: VaultFilterService, - }, - { - provide: BaseVaultFilterServiceInterface, - useExisting: VaultFilterServiceInterface, - }, - ], + providers: [VaultFilterService], }) export class VaultFilterModule {} diff --git a/src/app/modules/vault-filter/vault-filter.service.interface.ts b/src/app/modules/vault-filter/vault-filter.service.interface.ts deleted file mode 100644 index 34e3b999..00000000 --- a/src/app/modules/vault-filter/vault-filter.service.interface.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { DynamicTreeNode } from "jslib-angular/modules/vault-filter/models/dynamic-tree-node.model"; -import { VaultFilterServiceInterface as BaseVaultFilterServiceInterface } from "jslib-angular/modules/vault-filter/vault-filter.service.interface"; -import { CollectionView } from "jslib-common/models/view/collectionView"; - -export abstract class VaultFilterServiceInterface extends BaseVaultFilterServiceInterface { - buildAdminCollections: (organizationId: string) => Promise>; -} diff --git a/src/app/modules/vault-filter/vault-filter.service.ts b/src/app/modules/vault-filter/vault-filter.service.ts index 926c9634..a8e23e7d 100644 --- a/src/app/modules/vault-filter/vault-filter.service.ts +++ b/src/app/modules/vault-filter/vault-filter.service.ts @@ -14,13 +14,8 @@ import { Collection } from "jslib-common/models/domain/collection"; import { CollectionDetailsResponse } from "jslib-common/models/response/collectionResponse"; import { CollectionView } from "jslib-common/models/view/collectionView"; -import { VaultFilterServiceInterface } from "./vault-filter.service.interface"; - @Injectable() -export class VaultFilterService - extends BaseVaultFilterService - implements VaultFilterServiceInterface -{ +export class VaultFilterService extends BaseVaultFilterService { constructor( stateService: StateService, organizationService: OrganizationService,