Merge branch 'main' into main

bitwarden · Dec 12, 2024 · 4276cd6 · 4276cd6
2 parents de54454 + cecf1f2
commit 4276cd6
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 26 deletions.
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
@@ -20,7 +20,7 @@
     "**/node_modules/@bitwarden/desktop-napi/index.js",
     "**/node_modules/@bitwarden/desktop-napi/desktop_napi.${platform}-${arch}*.node"
   ],
-  "electronVersion": "32.1.1",
+  "electronVersion": "33.2.1",
   "generateUpdatesFilesForAllChannels": true,
   "publish": {
     "provider": "generic",

diff --git a/apps/desktop/src/main/tray.main.ts b/apps/desktop/src/main/tray.main.ts
@@ -64,9 +64,8 @@ export class TrayMain {
   }
 
   setupWindowListeners(win: BrowserWindow) {
-    win.on("minimize", async (e: Event) => {
+    win.on("minimize", async () => {
       if (await firstValueFrom(this.desktopSettingsService.minimizeToTray$)) {
-        e.preventDefault();
         // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.hideToTray();

diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/vnext-clients.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/vnext-clients.component.ts
@@ -53,8 +53,8 @@ const DisallowedPlanTypes = [
   ],
 })
 export class vNextClientsComponent {
-  providerId: string;
-  addableOrganizations: Organization[];
+  providerId: string = "";
+  addableOrganizations: Organization[] = [];
   loading = true;
   manageOrganizations = false;
   showAddExisting = false;
@@ -79,8 +79,8 @@ export class vNextClientsComponent {
       this.searchControl.setValue(queryParams.search);
     });
 
-    this.activatedRoute.parent.params
-      .pipe(
+    this.activatedRoute.parent?.params
+      ?.pipe(
         switchMap((params) => {
           this.providerId = params.providerId;
           return this.providerService.get$(this.providerId).pipe(
@@ -125,7 +125,7 @@ export class vNextClientsComponent {
       await this.webProviderService.detachOrganization(this.providerId, organization.id);
       this.toastService.showToast({
         variant: "success",
-        title: null,
+        title: "",
         message: this.i18nService.t("detachedOrganization", organization.organizationName),
       });
       await this.load();

diff --git a/...arden_license/bit-web/src/app/billing/providers/clients/vnext-manage-clients.component.ts b/...arden_license/bit-web/src/app/billing/providers/clients/vnext-manage-clients.component.ts
@@ -51,15 +51,15 @@ import { vNextNoClientsComponent } from "./vnext-no-clients.component";
   ],
 })
 export class vNextManageClientsComponent {
-  providerId: string;
-  provider: Provider;
+  providerId: string = "";
+  provider: Provider | undefined;
   loading = true;
   isProviderAdmin = false;
   dataSource: TableDataSource<ProviderOrganizationOrganizationDetailsResponse> =
     new TableDataSource();
 
   protected searchControl = new FormControl("", { nonNullable: true });
-  protected plans: PlanResponse[];
+  protected plans: PlanResponse[] = [];
 
   constructor(
     private billingApiService: BillingApiServiceAbstraction,
@@ -76,8 +76,8 @@ export class vNextManageClientsComponent {
       this.searchControl.setValue(queryParams.search);
     });
 
-    this.activatedRoute.parent.params
-      .pipe(
+    this.activatedRoute.parent?.params
+      ?.pipe(
         switchMap((params) => {
           this.providerId = params.providerId;
           return this.providerService.get$(this.providerId).pipe(
@@ -110,12 +110,12 @@ export class vNextManageClientsComponent {
   async load() {
     this.provider = await firstValueFrom(this.providerService.get$(this.providerId));
 
-    this.isProviderAdmin = this.provider.type === ProviderUserType.ProviderAdmin;
+    this.isProviderAdmin = this.provider?.type === ProviderUserType.ProviderAdmin;
 
     const clients = (await this.billingApiService.getProviderClientOrganizations(this.providerId))
       .data;
 
-    clients.forEach((client) => (client.plan = client.plan.replace(" (Monthly)", "")));
+    clients.forEach((client) => (client.plan = client.plan?.replace(" (Monthly)", "")));
 
     this.dataSource.data = clients;
 
@@ -146,7 +146,7 @@ export class vNextManageClientsComponent {
         organization: {
           id: organization.id,
           name: organization.organizationName,
-          seats: organization.seats,
+          seats: organization.seats ? organization.seats : 0,
         },
       },
     });
@@ -164,7 +164,7 @@ export class vNextManageClientsComponent {
     const dialogRef = openManageClientSubscriptionDialog(this.dialogService, {
       data: {
         organization,
-        provider: this.provider,
+        provider: this.provider!,
       },
     });
 
@@ -190,7 +190,7 @@ export class vNextManageClientsComponent {
       await this.webProviderService.detachOrganization(this.providerId, organization.id);
       this.toastService.showToast({
         variant: "success",
-        title: null,
+        title: "",
         message: this.i18nService.t("detachedOrganization", organization.organizationName),
       });
       await this.load();

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -93,7 +93,7 @@
     "copy-webpack-plugin": "12.0.2",
     "cross-env": "7.0.3",
     "css-loader": "7.1.2",
-    "electron": "32.1.1",
+    "electron": "33.2.1",
     "electron-builder": "24.13.3",
     "electron-log": "5.2.4",
     "electron-reload": "2.0.0-alpha.1",