bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-20 03:13:55 +00:00
Code Issues Releases Wiki Activity

move state update logic from component to at risk password callout service

Browse Source
This commit is contained in:
jng
2025-09-16 19:33:00 -04:00
parent 75a46567b0
commit 92db4e9645
3 changed files with 204 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
apps/browser/src/vault/popup/components/at-risk-callout/at-risk-password-callout.component.ts
View File

@@ -1,5 +1,5 @@
import { CommonModule } from "@angular/common";
import { Component, inject, effect, signal, Signal, WritableSignal, computed } from "@angular/core";
import { Component, inject, effect, signal, Signal, WritableSignal } from "@angular/core";
import { toSignal } from "@angular/core/rxjs-interop";
import { RouterModule } from "@angular/router";
@@ -30,15 +30,9 @@ export class AtRiskPasswordCalloutComponent {
private atRiskPasswordCalloutService = inject(AtRiskPasswordCalloutService);
private userIdSignal = toSignal(this.activeAccount$, { initialValue: null });
private atRiskPasswordStateSignal = toSignal(
this.atRiskPasswordCalloutService.atRiskPasswordState(this.userIdSignal()!).state$,
{
initialValue: {
hadPendingTasks: false,
showTasksCompleteBanner: false,
tasksBannerDismissed: false,
} as AtRiskPasswordCalloutData,
},
showTasksCompleteBanner = toSignal(
this.atRiskPasswordCalloutService.shouldShowCompletionBanner$(this.userIdSignal()!),
{ initialValue: false },
);
currentPendingTasks: Signal<SecurityTask[] | null> = toSignal(
@@ -50,58 +44,24 @@ export class AtRiskPasswordCalloutComponent {
dismissedClicked: WritableSignal<boolean> = signal(false);
showTasksCompleteBanner = computed(() => {
if (this.dismissedClicked()) {
return false;
}
const { showTasksCompleteBanner, hadPendingTasks } = this.atRiskPasswordStateSignal() ?? {};
const hasPendingTasks = (this.currentPendingTasks()?.length ?? 0) > 0;
return !hasPendingTasks && (showTasksCompleteBanner || hadPendingTasks);
});
constructor() {
effect(() => {
const pendingTasksLength = this.currentPendingTasks()?.length ?? 0;
let updateObject: AtRiskPasswordCalloutData | null = null;
// If the user has resolved all tasks, we will show the banner
if (this.atRiskPasswordStateSignal()?.hadPendingTasks && pendingTasksLength === 0) {
updateObject = {
hadPendingTasks: false,
showTasksCompleteBanner: true,
tasksBannerDismissed: false,
};
}
// If user has pending tasks set state hadPendingTasks to true
if (pendingTasksLength > 0) {
updateObject = {
hadPendingTasks: true,
showTasksCompleteBanner: false,
tasksBannerDismissed: false,
};
}
if (updateObject) {
this.atRiskPasswordCalloutService.updateAtRiskPasswordState(
this.userIdSignal()!,
updateObject,
);
}
this.atRiskPasswordCalloutService.updatePendingTasksState(
this.userIdSignal()!,
pendingTasksLength,
);
});
}
successBannerDismissed() {
// If the user dismisses the banner, we will update the state to reflect that
const updateObject: AtRiskPasswordCalloutData = {
hadPendingTasks: false,
showTasksCompleteBanner: false,
tasksBannerDismissed: true,
};
this.atRiskPasswordCalloutService.updateAtRiskPasswordState(this.userIdSignal()!, updateObject);
this.dismissedClicked.set(true);
}
}