Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-29 04:17:41 +02:00
Code Issues Projects Releases Wiki Activity

Instantiate all status map arrays on load (#1107)

Browse Source 
* Instantiate all status map arrays on load

* Update jslib

* Linter fixes
This commit is contained in:
Matt Gibson 2021-08-04 09:30:06 -04:00 committed by GitHub
parent 2c1b06a5d8
commit 44f624e9a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import {
} from '@angular/core'; } from '@angular/core';
import { ToasterService } from 'angular2-toaster'; import { ToasterService } from 'angular2-toaster';
import { ApiService } from 'jslib-common/abstractions/api.service';
import { I18nService } from 'jslib-common/abstractions/i18n.service'; import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { UserService } from 'jslib-common/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
@ -17,7 +18,7 @@ import { ProviderService } from '../services/provider.service';
import { Organization } from 'jslib-common/models/domain/organization'; import { Organization } from 'jslib-common/models/domain/organization';
import { Provider } from 'jslib-common/models/domain/provider'; import { Provider } from 'jslib-common/models/domain/provider';
import { ApiService } from 'jslib-common/abstractions';
import { PlanType } from 'jslib-common/enums/planType'; import { PlanType } from 'jslib-common/enums/planType';
const DisallowedPlanTypes = [PlanType.Free, PlanType.FamiliesAnnually2019, PlanType.FamiliesAnnually]; const DisallowedPlanTypes = [PlanType.Free, PlanType.FamiliesAnnually2019, PlanType.FamiliesAnnually];

2
jslib

@ -1 +1 @@
Subproject commit fdf0eb989be49e6f5d8215f2eac1da275923f427 Subproject commit 65c998dd0d8798f1ea1ee321bb490d5b94074f0c

6
src/app/common/base.people.component.ts
View File

@ -106,6 +106,10 @@ export abstract class BasePeopleComponent<UserType extends ProviderUserUserDetai
async load() { async load() {
const response = await this.getUsers(); const response = await this.getUsers();
this.statusMap.clear(); this.statusMap.clear();
for (const status of Utils.iterateEnum(this.userStatusType)) {
this.statusMap.set(status, []);
}
this.allUsers = response.data != null && response.data.length > 0 ? response.data : []; this.allUsers = response.data != null && response.data.length > 0 ? response.data : [];
this.allUsers.sort(Utils.getSortFunction(this.i18nService, 'email')); this.allUsers.sort(Utils.getSortFunction(this.i18nService, 'email'));
this.allUsers.forEach(u => { this.allUsers.forEach(u => {
@ -311,4 +315,4 @@ export abstract class BasePeopleComponent<UserType extends ProviderUserUserDetai
} }
} }
} }