From da62cec6f0d0477c0bd7c9b0bebf210c8986aff2 Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Tue, 10 May 2022 23:03:35 +1000 Subject: [PATCH 1/2] Remove testing requirements from PR template (#1654) --- .github/PULL_REQUEST_TEMPLATE.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a4441bfa..5ea1b631 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -21,10 +21,6 @@ -## Testing requirements - - - ## Before you submit - [ ] I have checked for **linting** errors (`npm run lint`) (required) From 81c6a4b1df6312b428ead749772464d31a74831b Mon Sep 17 00:00:00 2001 From: Addison Beck Date: Tue, 10 May 2022 09:04:39 -0400 Subject: [PATCH 2/2] [fix] Override collection filter init to consider organization vault (#1652) * [fix] Override collection filter init to consider organization vault * [dep] Update jslib --- jslib | 2 +- src/app/modules/vault-filter/vault-filter.component.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jslib b/jslib index 4550b7dd..00deb38d 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 4550b7ddf819b4f4f0a5d62376df6f7bf2425118 +Subproject commit 00deb38de589d67c48fa46be869e29aaef79fb8e diff --git a/src/app/modules/vault-filter/vault-filter.component.ts b/src/app/modules/vault-filter/vault-filter.component.ts index 2cbafef2..9ffee922 100644 --- a/src/app/modules/vault-filter/vault-filter.component.ts +++ b/src/app/modules/vault-filter/vault-filter.component.ts @@ -33,4 +33,8 @@ export class VaultFilterComponent extends BaseVaultFilterComponent { async reloadOrganizations() { this.organizations = await this.vaultFilterService.buildOrganizations(); } + + async initCollections() { + return await this.vaultFilterService.buildCollections(this.organization?.id); + } }