Merge branch 'main' of github.com:bitwarden/clients into arch/split-k…

…m-ui
bitwarden · Jan 28, 2025 · ed5291a · ed5291a
2 parents d615815 + 582beaf
commit ed5291a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 7 deletions.
diff --git a/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html
@@ -39,7 +39,13 @@
             <th bitCell bitSortable="organizationId" *ngIf="!isAdminConsoleActive">
               {{ "owner" | i18n }}
             </th>
-            <th bitCell class="tw-text-right" bitSortable="score" default>
+            <th
+              bitCell
+              class="tw-text-right"
+              bitSortable="score"
+              default
+              (sortChange)="onSortChange('score', $event)"
+            >
               {{ "weakness" | i18n }}
             </th>
           </tr>

diff --git a/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.ts
@@ -59,6 +59,7 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen
     this.weakPasswordCiphers = [];
     this.filterStatus = [0];
     this.findWeakPasswords(allCiphers);
+    this.weakPasswordCiphers = this.sortCiphers(this.weakPasswordCiphers, "score", false);
   }
 
   protected findWeakPasswords(ciphers: CipherView[]): void {
@@ -112,6 +113,29 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen
     this.filterCiphersByOrg(this.weakPasswordCiphers);
   }
 
+  onSortChange(field: string, event: Event) {
+    const target = event.target as HTMLInputElement;
+    const ascending = target.checked;
+    this.weakPasswordCiphers = this.sortCiphers(this.weakPasswordCiphers, field, ascending);
+  }
+
+  protected sortCiphers(
+    ciphers: ReportResult[],
+    field: string,
+    ascending: boolean,
+  ): ReportResult[] {
+    return ciphers.sort((a, b) => {
+      const aValue = a[field as keyof ReportResult];
+      const bValue = b[field as keyof ReportResult];
+
+      if (aValue === bValue) {
+        return 0;
+      }
+      const comparison = aValue > bValue ? 1 : -1;
+      return ascending ? comparison : -comparison;
+    });
+  }
+
   protected canManageCipher(c: CipherView): boolean {
     // this will only ever be false from the org view;
     return true;

diff --git a/libs/common/src/platform/sync/core-sync.service.ts b/libs/common/src/platform/sync/core-sync.service.ts
@@ -8,7 +8,6 @@ import { ApiService } from "../../abstractions/api.service";
 import { AccountService } from "../../auth/abstractions/account.service";
 import { AuthService } from "../../auth/abstractions/auth.service";
 import { AuthenticationStatus } from "../../auth/enums/authentication-status";
-import { getUserId } from "../../auth/services/account.service";
 import {
   SyncCipherNotification,
   SyncFolderNotification,
@@ -59,7 +58,7 @@ export abstract class CoreSyncService implements SyncService {
   abstract fullSync(forceSync: boolean, allowThrowOnError?: boolean): Promise<boolean>;
 
   async getLastSync(): Promise<Date> {
-    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(map((a) => a?.id)));
     if (userId == null) {
       return null;
     }

diff --git a/libs/common/src/platform/sync/default-sync.service.ts b/libs/common/src/platform/sync/default-sync.service.ts
@@ -1,6 +1,6 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { firstValueFrom } from "rxjs";
+import { firstValueFrom, map } from "rxjs";
 
 import {
   CollectionService,
@@ -34,7 +34,6 @@ import { InternalMasterPasswordServiceAbstraction } from "../../auth/abstraction
 import { TokenService } from "../../auth/abstractions/token.service";
 import { AuthenticationStatus } from "../../auth/enums/authentication-status";
 import { ForceSetPasswordReason } from "../../auth/models/domain/force-set-password-reason";
-import { getUserId } from "../../auth/services/account.service";
 import { DomainSettingsService } from "../../autofill/services/domain-settings.service";
 import { BillingAccountProfileStateService } from "../../billing/abstractions";
 import { DomainsResponse } from "../../models/response/domains.response";
@@ -108,7 +107,7 @@ export class DefaultSyncService extends CoreSyncService {
 
   @sequentialize(() => "fullSync")
   override async fullSync(forceSync: boolean, allowThrowOnError = false): Promise<boolean> {
-    const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
+    const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(map((a) => a?.id)));
     this.syncStarted();
     const authStatus = await firstValueFrom(this.authService.authStatusFor$(userId));
     if (authStatus === AuthenticationStatus.LoggedOut) {

diff --git a/libs/vault/src/components/carousel/carousel-button/carousel-button.component.html b/libs/vault/src/components/carousel/carousel-button/carousel-button.component.html
@@ -2,7 +2,7 @@
   #btn
   type="button"
   role="tab"
-  class="tw-h-6 tw-w-6 tw-p-0 tw-flex tw-items-center tw-justify-center tw-border-2 tw-border-solid tw-rounded-full tw-transition tw-bg-transparent tw-border-transparent focus-visible:tw-outline-none focus-visible:tw-border-primary-600"
+  class="tw-size-6 tw-p-0 tw-flex tw-items-center tw-justify-center tw-border-2 tw-border-solid tw-rounded-full tw-transition tw-bg-transparent tw-border-transparent focus-visible:tw-outline-none focus-visible:tw-border-primary-600"
   [ngClass]="dynamicClasses"
   [attr.aria-selected]="isActive"
   [attr.tabindex]="isActive ? 0 : -1"