devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Fix ModalService refactor bugs (#1168)

This commit is contained in:
Oscar Hinton 2021-08-31 16:42:43 +02:00 committed by GitHub
parent f08b6e7975
commit 2235664bed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitwarden_license/src/app/providers/clients/clients.component.ts
View File

@ -124,7 +124,7 @@ export class ClientsComponent implements OnInit {
}
async addExistingOrganization() {
const [modal, childComponent] = await this.modalService.openViewRef(AddOrganizationComponent, this.addModalRef, comp => {
const [modal] = await this.modalService.openViewRef(AddOrganizationComponent, this.addModalRef, comp => {
comp.providerId = this.providerId;
comp.organizations = this.addableOrganizations;
comp.onAddedOrganization.subscribe(async () => {

9
bitwarden_license/src/app/providers/providers.module.ts
View File

@ -1,7 +1,10 @@
import { CommonModule } from '@angular/common';
import { ComponentFactoryResolver } from '@angular/core';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { ModalService } from 'jslib-angular/services/modal.service';
import { ProviderGuardService } from './services/provider-guard.service';
import { ProviderTypeGuardService } from './services/provider-type-guard.service';
import { ProviderService } from './services/provider.service';
@ -59,4 +62,8 @@ import { OssModule } from 'src/app/oss.module';
ProviderTypeGuardService,
],
})
export class ProvidersModule {}
export class ProvidersModule {
constructor(modalService: ModalService, componentFactoryResolver: ComponentFactoryResolver) {
modalService.registerComponentFactoryResolver(AddOrganizationComponent, componentFactoryResolver);
}
}

2
jslib

@ -1 +1 @@
Subproject commit f02720a1c654adeb73d68b73bb61fcf7415041f4
Subproject commit d50531886bb8a797e98a3aeea08a7ed54e768788

2
src/app/send/send.component.ts
View File

@ -72,7 +72,7 @@ export class SendComponent extends BaseSendComponent {
async editSend(send: SendView) {
const [modal, childComponent] = await this.modalService.openViewRef(AddEditComponent, this.sendAddEditModalRef, comp => {
childComponent.sendId = send == null ? null : send.id;
comp.sendId = send == null ? null : send.id;
comp.onSavedSend.subscribe(async (s: SendView) => {
modal.close();
await this.load();