[SG-16] Fix various small bugs (#1686)
* Fix all items showing in No Folder * Fix folders not showing for orgs * Fix missing toasts if there are errors with org options
This commit is contained in:
parent
45da771404
commit
6f7b712bc7
|
@ -1,4 +1,4 @@
|
|||
<ng-container *ngIf="!hide && !activeFilter.selectedOrganizationId">
|
||||
<ng-container *ngIf="!hide">
|
||||
<div class="filter-heading">
|
||||
<button
|
||||
class="toggle-button"
|
||||
|
|
|
@ -82,6 +82,7 @@ export class OrganizationOptionsComponent {
|
|||
this.platformUtilsService.showToast("success", null, "Unlinked SSO");
|
||||
await this.load();
|
||||
} catch (e) {
|
||||
this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), e.message);
|
||||
this.logService.error(e);
|
||||
}
|
||||
}
|
||||
|
@ -106,6 +107,7 @@ export class OrganizationOptionsComponent {
|
|||
this.platformUtilsService.showToast("success", null, this.i18nService.t("leftOrganization"));
|
||||
await this.load();
|
||||
} catch (e) {
|
||||
this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), e.message);
|
||||
this.logService.error(e);
|
||||
}
|
||||
}
|
||||
|
@ -173,6 +175,7 @@ export class OrganizationOptionsComponent {
|
|||
this.platformUtilsService.showToast("success", null, this.i18nService.t(toastStringRef));
|
||||
await this.load();
|
||||
} catch (e) {
|
||||
this.platformUtilsService.showToast("error", this.i18nService.t("errorOccurred"), e.message);
|
||||
this.logService.error(e);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -209,7 +209,7 @@ export class IndividualVaultComponent implements OnInit, OnDestroy {
|
|||
cipherPassesFilter = cipher.type === this.activeFilter.cipherType;
|
||||
}
|
||||
if (
|
||||
this.activeFilter.selectedFolderId != null &&
|
||||
this.activeFilter.selectedFolder &&
|
||||
this.activeFilter.selectedFolderId != "none" &&
|
||||
cipherPassesFilter
|
||||
) {
|
||||
|
|
|
@ -172,7 +172,7 @@ export class OrganizationVaultComponent implements OnInit, OnDestroy {
|
|||
cipherPassesFilter = cipher.type === this.activeFilter.cipherType;
|
||||
}
|
||||
if (
|
||||
this.activeFilter.selectedFolderId != null &&
|
||||
this.activeFilter.selectedFolder != null &&
|
||||
this.activeFilter.selectedFolderId != "none" &&
|
||||
cipherPassesFilter
|
||||
) {
|
||||
|
|
Loading…
Reference in New Issue