bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 01:33:33 +00:00
Code Issues Releases Wiki Activity

Provider qa feedback (#1118)

Browse Source 
* Ensure business plan is selected for providers

* Show add organization button on if user has valid orgs to add

* Correct client owner description

* No drop down options if you can't manage organizations
This commit is contained in:
Matt Gibson
2021-08-09 13:24:12 -04:00
committed by GitHub
parent 2b0d3f9e0d
commit 9bdda9cc4c
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bitwarden_license/src/app/providers/clients/add-organization.component.ts
View File

@@ -21,8 +21,6 @@ import { Provider } from 'jslib-common/models/domain/provider';
import { PlanType } from 'jslib-common/enums/planType';
const DisallowedPlanTypes = [PlanType.Free, PlanType.FamiliesAnnually2019, PlanType.FamiliesAnnually];
@Component({
selector: 'provider-add-organization',
templateUrl: 'add-organization.component.html',
@@ -30,12 +28,12 @@ const DisallowedPlanTypes = [PlanType.Free, PlanType.FamiliesAnnually2019, PlanT
export class AddOrganizationComponent implements OnInit {
@Input() providerId: string;
@Input() organizations: Organization[];
@Output() onAddedOrganization = new EventEmitter();
provider: Provider;
formPromise: Promise<any>;
loading = true;
organizations: Organization[];
constructor(private userService: UserService, private providerService: ProviderService,
private toasterService: ToasterService, private i18nService: I18nService,
@@ -53,12 +51,6 @@ export class AddOrganizationComponent implements OnInit {
this.provider = await this.userService.getProvider(this.providerId);
const candidateOrgs = (await this.userService.getAllOrganizations()).filter(o => o.providerId == null);
const allowedOrgsIds = await Promise.all(candidateOrgs.map(o => this.apiService.getOrganization(o.id))).then(orgs =>
orgs.filter(o => !DisallowedPlanTypes.includes(o.planType))
.map(o => o.id));
this.organizations = candidateOrgs.filter(o => allowedOrgsIds.includes(o.id));
this.loading = false;
}