From 4292744ca85248d18719a4bba2f1b1e95ae1daa5 Mon Sep 17 00:00:00 2001 From: Brandon Treston Date: Thu, 1 May 2025 15:20:22 -0400 Subject: [PATCH] remove deprecated component (#14582) --- .../manage/user-add-edit.component.html | 124 ----------------- .../manage/user-add-edit.component.ts | 125 ------------------ .../providers/providers.module.ts | 2 - 3 files changed, 251 deletions(-) delete mode 100644 bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.html delete mode 100644 bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.ts diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.html deleted file mode 100644 index 78d80d005c9..00000000000 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.html +++ /dev/null @@ -1,124 +0,0 @@ - diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.ts deleted file mode 100644 index 82671a7e418..00000000000 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.ts +++ /dev/null @@ -1,125 +0,0 @@ -// FIXME: Update this file to be type safe and remove this and next line -// @ts-strict-ignore -import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; - -import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { ProviderUserType } from "@bitwarden/common/admin-console/enums"; -import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permissions.api"; -import { ProviderUserInviteRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-invite.request"; -import { ProviderUserUpdateRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-update.request"; -import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { DialogService, ToastService } from "@bitwarden/components"; - -/** - * @deprecated Please use the {@link MembersDialogComponent} instead. - */ -@Component({ - selector: "provider-user-add-edit", - templateUrl: "user-add-edit.component.html", -}) -export class UserAddEditComponent implements OnInit { - @Input() name: string; - @Input() providerUserId: string; - @Input() providerId: string; - @Output() savedUser = new EventEmitter(); - @Output() deletedUser = new EventEmitter(); - - loading = true; - editMode = false; - title: string; - emails: string; - type: ProviderUserType = ProviderUserType.ServiceUser; - permissions = new PermissionsApi(); - showCustom = false; - access: "all" | "selected" = "selected"; - formPromise: Promise; - deletePromise: Promise; - userType = ProviderUserType; - - constructor( - private apiService: ApiService, - private i18nService: I18nService, - private platformUtilsService: PlatformUtilsService, - private logService: LogService, - private dialogService: DialogService, - private toastService: ToastService, - ) {} - - async ngOnInit() { - this.editMode = this.loading = this.providerUserId != null; - - if (this.editMode) { - this.editMode = true; - this.title = this.i18nService.t("editMember"); - try { - const user = await this.apiService.getProviderUser(this.providerId, this.providerUserId); - this.type = user.type; - } catch (e) { - this.logService.error(e); - } - } else { - this.title = this.i18nService.t("inviteMember"); - } - - this.loading = false; - } - - async submit() { - try { - if (this.editMode) { - const request = new ProviderUserUpdateRequest(); - request.type = this.type; - this.formPromise = this.apiService.putProviderUser( - this.providerId, - this.providerUserId, - request, - ); - } else { - const request = new ProviderUserInviteRequest(); - request.emails = this.emails.trim().split(/\s*,\s*/); - request.type = this.type; - this.formPromise = this.apiService.postProviderUserInvite(this.providerId, request); - } - await this.formPromise; - this.toastService.showToast({ - variant: "success", - title: null, - message: this.i18nService.t(this.editMode ? "editedUserId" : "invitedUsers", this.name), - }); - this.savedUser.emit(); - } catch (e) { - this.logService.error(e); - } - } - - async delete() { - if (!this.editMode) { - return; - } - - const confirmed = await this.dialogService.openSimpleDialog({ - title: this.name, - content: { key: "removeUserConfirmation" }, - type: "warning", - }); - - if (!confirmed) { - return false; - } - - try { - this.deletePromise = this.apiService.deleteProviderUser(this.providerId, this.providerUserId); - await this.deletePromise; - this.toastService.showToast({ - variant: "success", - title: null, - message: this.i18nService.t("removedUserId", this.name), - }); - this.deletedUser.emit(); - } catch (e) { - this.logService.error(e); - } - } -} diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts index 1c15812edc8..597acb0d4f0 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts @@ -30,7 +30,6 @@ import { BulkConfirmDialogComponent } from "./manage/dialogs/bulk-confirm-dialog import { BulkRemoveDialogComponent } from "./manage/dialogs/bulk-remove-dialog.component"; import { EventsComponent } from "./manage/events.component"; import { MembersComponent } from "./manage/members.component"; -import { UserAddEditComponent } from "./manage/user-add-edit.component"; import { ProvidersLayoutComponent } from "./providers-layout.component"; import { ProvidersRoutingModule } from "./providers-routing.module"; import { ProvidersComponent } from "./providers.component"; @@ -67,7 +66,6 @@ import { VerifyRecoverDeleteProviderComponent } from "./verify-recover-delete-pr MembersComponent, SetupComponent, SetupProviderComponent, - UserAddEditComponent, AddEditMemberDialogComponent, AddExistingOrganizationDialogComponent, CreateClientDialogComponent,