+
+
+
+
diff --git a/bitwarden_license/bit-web/src/app/sm/layout/layout.component.ts b/bitwarden_license/bit-web/src/app/sm/layout/layout.component.ts
new file mode 100644
index 00000000000..6a90eb2a78f
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/sm/layout/layout.component.ts
@@ -0,0 +1,11 @@
+import { Component, OnInit } from "@angular/core";
+
+@Component({
+ selector: "sm-layout",
+ templateUrl: "./layout.component.html",
+})
+export class LayoutComponent implements OnInit {
+ ngOnInit() {
+ document.body.classList.remove("layout_frontend");
+ }
+}
diff --git a/bitwarden_license/bit-web/src/app/sm/layout/navigation.component.html b/bitwarden_license/bit-web/src/app/sm/layout/navigation.component.html
new file mode 100644
index 00000000000..b664d4fcaaf
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/sm/layout/navigation.component.html
@@ -0,0 +1,13 @@
+
+
+
diff --git a/bitwarden_license/bit-web/src/app/sm/layout/navigation.component.ts b/bitwarden_license/bit-web/src/app/sm/layout/navigation.component.ts
new file mode 100644
index 00000000000..8814d8490da
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/sm/layout/navigation.component.ts
@@ -0,0 +1,7 @@
+import { Component } from "@angular/core";
+
+@Component({
+ selector: "sm-navigation",
+ templateUrl: "./navigation.component.html",
+})
+export class NavigationComponent {}
diff --git a/bitwarden_license/bit-web/src/app/sm/secrets/secrets-routing.module.ts b/bitwarden_license/bit-web/src/app/sm/secrets/secrets-routing.module.ts
new file mode 100644
index 00000000000..9f76f921030
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/sm/secrets/secrets-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";
+
+import { SecretsComponent } from "./secrets.component";
+
+const routes: Routes = [
+ {
+ path: "",
+ component: SecretsComponent,
+ },
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class SecretsRoutingModule {}
diff --git a/bitwarden_license/bit-web/src/app/sm/secrets/secrets.component.html b/bitwarden_license/bit-web/src/app/sm/secrets/secrets.component.html
new file mode 100644
index 00000000000..e17c4fdbc1c
--- /dev/null
+++ b/bitwarden_license/bit-web/src/app/sm/secrets/secrets.component.html
@@ -0,0 +1 @@
+Secrets
diff --git a/bitwarden_license/bit-web/src/app/sm/secrets/secrets.component.ts b/bitwarden_license/bit-web/src/app/sm/secrets/secrets.component.ts new file mode 100644 index 00000000000..9b12584e527 --- /dev/null +++ b/bitwarden_license/bit-web/src/app/sm/secrets/secrets.component.ts @@ -0,0 +1,7 @@ +import { Component } from "@angular/core"; + +@Component({ + selector: "sm-secrets", + templateUrl: "./secrets.component.html", +}) +export class SecretsComponent {} diff --git a/bitwarden_license/bit-web/src/app/sm/secrets/secrets.module.ts b/bitwarden_license/bit-web/src/app/sm/secrets/secrets.module.ts new file mode 100644 index 00000000000..b98e2a8f7f9 --- /dev/null +++ b/bitwarden_license/bit-web/src/app/sm/secrets/secrets.module.ts @@ -0,0 +1,12 @@ +import { CommonModule } from "@angular/common"; +import { NgModule } from "@angular/core"; + +import { SecretsRoutingModule } from "./secrets-routing.module"; +import { SecretsComponent } from "./secrets.component"; + +@NgModule({ + imports: [CommonModule, SecretsRoutingModule], + declarations: [SecretsComponent], + providers: [], +}) +export class SecretsModule {} diff --git a/bitwarden_license/bit-web/src/app/sm/sm-routing.module.ts b/bitwarden_license/bit-web/src/app/sm/sm-routing.module.ts new file mode 100644 index 00000000000..8e936761bc3 --- /dev/null +++ b/bitwarden_license/bit-web/src/app/sm/sm-routing.module.ts @@ -0,0 +1,36 @@ +import { NgModule } from "@angular/core"; +import { RouterModule, Routes } from "@angular/router"; + +import { LayoutComponent } from "./layout/layout.component"; +import { NavigationComponent } from "./layout/navigation.component"; +import { SecretsModule } from "./secrets/secrets.module"; +import { SMGuard } from "./sm.guard"; + +const routes: Routes = [ + { + path: "", + component: LayoutComponent, + canActivate: [SMGuard], + children: [ + { + path: "", + component: NavigationComponent, + outlet: "sidebar", + }, + { + path: "secrets", + loadChildren: () => SecretsModule, + }, + { + path: "", + redirectTo: "secrets", + }, + ], + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class SecretsManagerRoutingModule {} diff --git a/bitwarden_license/bit-web/src/app/sm/sm.guard.ts b/bitwarden_license/bit-web/src/app/sm/sm.guard.ts new file mode 100644 index 00000000000..f9bc86f12b3 --- /dev/null +++ b/bitwarden_license/bit-web/src/app/sm/sm.guard.ts @@ -0,0 +1,13 @@ +import { Injectable } from "@angular/core"; +import { ActivatedRouteSnapshot, CanActivate } from "@angular/router"; + +import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; + +@Injectable() +export class SMGuard implements CanActivate { + constructor(private platformUtilsService: PlatformUtilsService) {} + + async canActivate(route: ActivatedRouteSnapshot) { + return this.platformUtilsService.isDev(); + } +} diff --git a/bitwarden_license/bit-web/src/app/sm/sm.module.ts b/bitwarden_license/bit-web/src/app/sm/sm.module.ts new file mode 100644 index 00000000000..acefe817153 --- /dev/null +++ b/bitwarden_license/bit-web/src/app/sm/sm.module.ts @@ -0,0 +1,19 @@ +import { CommonModule } from "@angular/common"; +import { NgModule } from "@angular/core"; +import { FormsModule } from "@angular/forms"; + +import { JslibModule } from "@bitwarden/angular/jslib.module"; + +import { OssModule } from "src/app/oss.module"; + +import { LayoutComponent } from "./layout/layout.component"; +import { NavigationComponent } from "./layout/navigation.component"; +import { SecretsManagerRoutingModule } from "./sm-routing.module"; +import { SMGuard } from "./sm.guard"; + +@NgModule({ + imports: [CommonModule, FormsModule, OssModule, JslibModule, SecretsManagerRoutingModule], + declarations: [LayoutComponent, NavigationComponent], + providers: [SMGuard], +}) +export class SecretsManagerModule {} From 9fef1d21a437351be98a85ee15b8a42d03c38c9f Mon Sep 17 00:00:00 2001 From: Gbubemi Smith
s != "");
}
- @HostBinding() id = `bit-input-${nextId++}`;
+ @HostBinding() @Input() id = `bit-input-${nextId++}`;
@HostBinding("attr.aria-describedby") ariaDescribedBy: string;
From 8cb92d425c8ebcc8d09bf7258fa9133ab31725c6 Mon Sep 17 00:00:00 2001
From: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>
Date: Fri, 22 Jul 2022 10:55:45 -0500
Subject: [PATCH 07/28] [CL-29] Modal Components for the component library
(#3053)
The purpose of this PR is to add Modals into the component library.
To note, this PR is focused on the visual of the modal that will "pop-up" and not the actual pop-up implementation.
---
libs/components/src/index.ts | 1 +
libs/components/src/modal/index.ts | 3 +
.../src/modal/modal-simple.component.html | 19 +++++
.../src/modal/modal-simple.component.ts | 16 ++++
.../src/modal/modal-simple.stories.ts | 85 +++++++++++++++++++
.../components/src/modal/modal.component.html | 25 ++++++
libs/components/src/modal/modal.component.ts | 23 +++++
libs/components/src/modal/modal.module.ts | 12 +++
libs/components/src/modal/modal.stories.ts | 80 +++++++++++++++++
9 files changed, 264 insertions(+)
create mode 100644 libs/components/src/modal/index.ts
create mode 100644 libs/components/src/modal/modal-simple.component.html
create mode 100644 libs/components/src/modal/modal-simple.component.ts
create mode 100644 libs/components/src/modal/modal-simple.stories.ts
create mode 100644 libs/components/src/modal/modal.component.html
create mode 100644 libs/components/src/modal/modal.component.ts
create mode 100644 libs/components/src/modal/modal.module.ts
create mode 100644 libs/components/src/modal/modal.stories.ts
diff --git a/libs/components/src/index.ts b/libs/components/src/index.ts
index 5ccceae874c..10553ab5c71 100644
--- a/libs/components/src/index.ts
+++ b/libs/components/src/index.ts
@@ -5,6 +5,7 @@ export * from "./toggle-group";
export * from "./callout";
export * from "./form-field";
export * from "./menu";
+export * from "./modal";
export * from "./utils/i18n-mock.service";
export * from "./tabs";
export * from "./submit-button";
diff --git a/libs/components/src/modal/index.ts b/libs/components/src/modal/index.ts
new file mode 100644
index 00000000000..5c8ac1f8e8d
--- /dev/null
+++ b/libs/components/src/modal/index.ts
@@ -0,0 +1,3 @@
+export * from "./modal.component";
+export * from "./modal-simple.component";
+export * from "./modal.module";
diff --git a/libs/components/src/modal/modal-simple.component.html b/libs/components/src/modal/modal-simple.component.html
new file mode 100644
index 00000000000..f60d2e3e338
--- /dev/null
+++ b/libs/components/src/modal/modal-simple.component.html
@@ -0,0 +1,19 @@
+ = (args: ModalSimpleComponent) => ({
+ props: args,
+ template: `
+
+ Alert Modal
+
+ Message Content
+
+
+ `,
+});
+
+export const Default = Template.bind({});
+
+const TemplateWithIcon: Story = (args: ModalSimpleComponent) => ({
+ props: args,
+ template: `
+
+
+ Premium Subscription Available
+
+ Message Content
+
+
+ `,
+});
+
+export const CustomIcon = TemplateWithIcon.bind({});
+
+const TemplateScroll: Story = (args: ModalSimpleComponent) => ({
+ props: args,
+ template: `
+
+ Alert Modal
+
+ Message Content
+ Message text goes here.
+
+ repeating lines of characters
+
+ end of sequence!
+
+
+ `,
+});
+
+export const ScrollingContent = TemplateScroll.bind({});
+ScrollingContent.args = {
+ useDefaultIcon: true,
+};
diff --git a/libs/components/src/modal/modal.component.html b/libs/components/src/modal/modal.component.html
new file mode 100644
index 00000000000..e6d0fb50011
--- /dev/null
+++ b/libs/components/src/modal/modal.component.html
@@ -0,0 +1,25 @@
+ = (args: ModalComponent) => ({
+ props: args,
+ template: `
+
+ Modal Title
+
+ Modal body text goes here.
+
+
+ `,
+});
+
+export const Default = Template.bind({});
+Default.args = {
+ modalSize: "default",
+};
+
+export const Small = Template.bind({});
+Small.args = {
+ modalSize: "small",
+};
+
+export const Large = Template.bind({});
+Large.args = {
+ modalSize: "large",
+};
+
+const TemplateScrolling: Story = (args: ModalComponent) => ({
+ props: args,
+ template: `
+
+ Modal Title
+
+ Modal body text goes here.
+
+ repeating lines of characters
+
+ end of sequence!
+
+
+ `,
+});
+
+export const ScrollingContent = TemplateScrolling.bind({});
+ScrollingContent.args = {
+ modalSize: "small",
+};
From 528af15eb0efd30e8ddf198bdc5741032db3c1c5 Mon Sep 17 00:00:00 2001
From: Matt Gibson
Date: Fri, 22 Jul 2022 12:41:02 -0400
Subject: [PATCH 08/28] Do not use deprecated method (#3155)
---
apps/browser/src/background/main.background.ts | 2 +-
apps/cli/src/bw.ts | 2 +-
apps/web/src/app/services/init.service.ts | 2 +-
libs/common/src/services/container.service.ts | 5 -----
4 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index cfc66fe02bf..6f359c95584 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -517,7 +517,7 @@ export default class MainBackground {
}
async bootstrap() {
- this.containerService.attachToWindow(window);
+ this.containerService.attachToGlobal(window);
await this.stateService.init();
diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts
index fe0391772c5..6c217a7569c 100644
--- a/apps/cli/src/bw.ts
+++ b/apps/cli/src/bw.ts
@@ -377,7 +377,7 @@ export class Main {
private async init() {
await this.storageService.init();
await this.stateService.init();
- this.containerService.attachToWindow(global);
+ this.containerService.attachToGlobal(global);
await this.environmentService.setUrlsFromStorage();
const locale = await this.stateService.getLocale();
await this.i18nService.init(locale);
diff --git a/apps/web/src/app/services/init.service.ts b/apps/web/src/app/services/init.service.ts
index 047a28da180..0ab752c8f79 100644
--- a/apps/web/src/app/services/init.service.ts
+++ b/apps/web/src/app/services/init.service.ts
@@ -52,7 +52,7 @@ export class InitService {
htmlEl.classList.add("locale_" + this.i18nService.translationLocale);
await this.themingService.monitorThemeChanges();
const containerService = new ContainerService(this.cryptoService);
- containerService.attachToWindow(this.win);
+ containerService.attachToGlobal(this.win);
};
}
}
diff --git a/libs/common/src/services/container.service.ts b/libs/common/src/services/container.service.ts
index 2880e7c7806..848a8b0389d 100644
--- a/libs/common/src/services/container.service.ts
+++ b/libs/common/src/services/container.service.ts
@@ -3,11 +3,6 @@ import { CryptoService } from "../abstractions/crypto.service";
export class ContainerService {
constructor(private cryptoService: CryptoService) {}
- // deprecated, use attachToGlobal instead
- attachToWindow(win: any) {
- this.attachToGlobal(win);
- }
-
attachToGlobal(global: any) {
if (!global.bitwardenContainerService) {
global.bitwardenContainerService = this;
From 8694227b92d8f4c1f573a930132002fdf431703a Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Fri, 22 Jul 2022 14:22:37 -0500
Subject: [PATCH 09/28] [CL-17] Use focus-visible for keyboard selection
(#3152)
---
libs/components/src/tabs/tab-item.component.ts | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libs/components/src/tabs/tab-item.component.ts b/libs/components/src/tabs/tab-item.component.ts
index cda332e26d5..b8fb7a1e2bb 100644
--- a/libs/components/src/tabs/tab-item.component.ts
+++ b/libs/components/src/tabs/tab-item.component.ts
@@ -25,10 +25,10 @@ export class TabItemComponent {
"!tw-text-main",
"hover:tw-underline",
"hover:!tw-text-main",
- "focus:tw-z-10",
- "focus:tw-outline-none",
- "focus:tw-ring-2",
- "focus:tw-ring-primary-700",
+ "focus-visible:tw-z-10",
+ "focus-visible:tw-outline-none",
+ "focus-visible:tw-ring-2",
+ "focus-visible:tw-ring-primary-700",
"disabled:tw-bg-secondary-100",
"disabled:!tw-text-muted",
"disabled:tw-no-underline",
@@ -47,8 +47,8 @@ export class TabItemComponent {
"!tw-text-primary-500",
"hover:tw-border-t-primary-700",
"hover:!tw-text-primary-700",
- "focus:tw-border-t-primary-700",
- "focus:!tw-text-primary-700",
+ "focus-visible:tw-border-t-primary-700",
+ "focus-visible:!tw-text-primary-700",
].join(" ");
}
}
From 0f44789d0f1dfe6f8928ba509676cf37390c99af Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Mon, 25 Jul 2022 10:47:56 +1000
Subject: [PATCH 10/28] [EC-338] Update SCIM code naming conventions
(revoked/restore) (#3160)
---
.../src/app/common/base.people.component.ts | 32 +++++++------------
.../app/modules/loose-components.module.ts | 6 ++--
...tml => bulk-restore-revoke.component.html} | 2 +-
...nt.ts => bulk-restore-revoke.component.ts} | 20 ++++++------
.../manage/people.component.html | 20 ++++++------
.../organizations/manage/people.component.ts | 28 ++++++++--------
.../manage/user-add-edit.component.html | 10 +++---
.../manage/user-add-edit.component.ts | 24 +++++++-------
apps/web/src/app/services/event.service.ts | 4 +--
.../app/providers/manage/people.component.ts | 4 +--
libs/common/src/abstractions/api.service.ts | 8 ++---
libs/common/src/enums/eventType.ts | 4 +--
.../src/enums/organizationUserStatusType.ts | 2 +-
.../src/enums/providerUserStatusType.ts | 2 +-
libs/common/src/services/api.service.ts | 16 +++++-----
15 files changed, 87 insertions(+), 95 deletions(-)
rename apps/web/src/app/organizations/manage/bulk/{bulk-deactivate.component.html => bulk-restore-revoke.component.html} (99%)
rename apps/web/src/app/organizations/manage/bulk/{bulk-deactivate.component.ts => bulk-restore-revoke.component.ts} (70%)
diff --git a/apps/web/src/app/common/base.people.component.ts b/apps/web/src/app/common/base.people.component.ts
index 24344890868..b1aab35b322 100644
--- a/apps/web/src/app/common/base.people.component.ts
+++ b/apps/web/src/app/common/base.people.component.ts
@@ -55,9 +55,9 @@ export abstract class BasePeopleComponent<
: 0;
}
- get deactivatedCount() {
- return this.statusMap.has(this.userStatusType.Deactivated)
- ? this.statusMap.get(this.userStatusType.Deactivated).length
+ get revokedCount() {
+ return this.statusMap.has(this.userStatusType.Revoked)
+ ? this.statusMap.get(this.userStatusType.Revoked).length
: 0;
}
@@ -112,8 +112,8 @@ export abstract class BasePeopleComponent<
abstract edit(user: UserType): void;
abstract getUsers(): Promise>;
abstract deleteUser(id: string): Promise;
- abstract deactivateUser(id: string): Promise;
- abstract activateUser(id: string): Promise;
+ abstract revokeUser(id: string): Promise;
+ abstract restoreUser(id: string): Promise;
abstract reinviteUser(id: string): Promise;
abstract confirmUser(user: UserType, publicKey: Uint8Array): Promise;
@@ -133,7 +133,7 @@ export abstract class BasePeopleComponent<
} else {
this.statusMap.get(u.status).push(u);
}
- if (u.status !== this.userStatusType.Deactivated) {
+ if (u.status !== this.userStatusType.Revoked) {
this.activeUsers.push(u);
}
});
@@ -235,9 +235,9 @@ export abstract class BasePeopleComponent<
this.actionPromise = null;
}
- async deactivate(user: UserType) {
+ async revoke(user: UserType) {
const confirmed = await this.platformUtilsService.showDialog(
- this.deactivateWarningMessage(),
+ this.revokeWarningMessage(),
this.i18nService.t("revokeUserId", this.userNamePipe.transform(user)),
this.i18nService.t("revokeAccess"),
this.i18nService.t("cancel"),
@@ -248,7 +248,7 @@ export abstract class BasePeopleComponent<
return false;
}
- this.actionPromise = this.deactivateUser(user.id);
+ this.actionPromise = this.revokeUser(user.id);
try {
await this.actionPromise;
this.platformUtilsService.showToast(
@@ -263,8 +263,8 @@ export abstract class BasePeopleComponent<
this.actionPromise = null;
}
- async activate(user: UserType) {
- this.actionPromise = this.activateUser(user.id);
+ async restore(user: UserType) {
+ this.actionPromise = this.restoreUser(user.id);
try {
await this.actionPromise;
this.platformUtilsService.showToast(
@@ -381,18 +381,10 @@ export abstract class BasePeopleComponent<
return !searching && this.users && this.users.length > this.pageSize;
}
- protected deleteWarningMessage(user: UserType): string {
- return this.i18nService.t("removeUserConfirmation");
- }
-
- protected deactivateWarningMessage(): string {
+ protected revokeWarningMessage(): string {
return this.i18nService.t("revokeUserConfirmation");
}
- protected activateWarningMessage(): string {
- return this.i18nService.t("activateUserConfirmation");
- }
-
protected getCheckedUsers() {
return this.users.filter((u) => (u as any).checked);
}
diff --git a/apps/web/src/app/modules/loose-components.module.ts b/apps/web/src/app/modules/loose-components.module.ts
index 37b6d8172ff..1d6d66b4787 100644
--- a/apps/web/src/app/modules/loose-components.module.ts
+++ b/apps/web/src/app/modules/loose-components.module.ts
@@ -29,8 +29,8 @@ import { NavbarComponent } from "../layouts/navbar.component";
import { UserLayoutComponent } from "../layouts/user-layout.component";
import { OrganizationLayoutComponent } from "../organizations/layouts/organization-layout.component";
import { BulkConfirmComponent as OrgBulkConfirmComponent } from "../organizations/manage/bulk/bulk-confirm.component";
-import { BulkDeactivateComponent as OrgBulkDeactivateomponent } from "../organizations/manage/bulk/bulk-deactivate.component";
import { BulkRemoveComponent as OrgBulkRemoveComponent } from "../organizations/manage/bulk/bulk-remove.component";
+import { BulkRestoreRevokeComponent as OrgBulkRestoreRevokeComponent } from "../organizations/manage/bulk/bulk-restore-revoke.component";
import { BulkStatusComponent as OrgBulkStatusComponent } from "../organizations/manage/bulk/bulk-status.component";
import { CollectionAddEditComponent as OrgCollectionAddEditComponent } from "../organizations/manage/collection-add-edit.component";
import { CollectionsComponent as OrgManageCollectionsComponent } from "../organizations/manage/collections.component";
@@ -237,7 +237,7 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
OrganizationSubscriptionComponent,
OrgAttachmentsComponent,
OrgBulkConfirmComponent,
- OrgBulkDeactivateomponent,
+ OrgBulkRestoreRevokeComponent,
OrgBulkRemoveComponent,
OrgBulkStatusComponent,
OrgCiphersComponent,
@@ -390,7 +390,7 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
OrganizationSubscriptionComponent,
OrgAttachmentsComponent,
OrgBulkConfirmComponent,
- OrgBulkDeactivateomponent,
+ OrgBulkRestoreRevokeComponent,
OrgBulkRemoveComponent,
OrgBulkStatusComponent,
OrgCiphersComponent,
diff --git a/apps/web/src/app/organizations/manage/bulk/bulk-deactivate.component.html b/apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.html
similarity index 99%
rename from apps/web/src/app/organizations/manage/bulk/bulk-deactivate.component.html
rename to apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.html
index d2005be2290..e02ee93e885 100644
--- a/apps/web/src/app/organizations/manage/bulk/bulk-deactivate.component.html
+++ b/apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.html
@@ -22,7 +22,7 @@
{{ error }}
-
+
{{ "revokeUsersWarning" | i18n }}
diff --git a/apps/web/src/app/organizations/manage/bulk/bulk-deactivate.component.ts b/apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.ts
similarity index 70%
rename from apps/web/src/app/organizations/manage/bulk/bulk-deactivate.component.ts
rename to apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.ts
index 558c312825f..fa0a916ef05 100644
--- a/apps/web/src/app/organizations/manage/bulk/bulk-deactivate.component.ts
+++ b/apps/web/src/app/organizations/manage/bulk/bulk-restore-revoke.component.ts
@@ -8,11 +8,11 @@ import { OrganizationUserBulkRequest } from "@bitwarden/common/models/request/or
import { BulkUserDetails } from "./bulk-status.component";
@Component({
- selector: "app-bulk-deactivate",
- templateUrl: "bulk-deactivate.component.html",
+ selector: "app-bulk-restore-revoke",
+ templateUrl: "bulk-restore-revoke.component.html",
})
-export class BulkDeactivateComponent {
- isDeactivating: boolean;
+export class BulkRestoreRevokeComponent {
+ isRevoking: boolean;
organizationId: string;
users: BulkUserDetails[];
@@ -27,13 +27,13 @@ export class BulkDeactivateComponent {
protected i18nService: I18nService,
config: ModalConfig
) {
- this.isDeactivating = config.data.isDeactivating;
+ this.isRevoking = config.data.isRevoking;
this.organizationId = config.data.organizationId;
this.users = config.data.users;
}
get bulkTitle() {
- const titleKey = this.isDeactivating ? "revokeUsers" : "restoreUsers";
+ const titleKey = this.isRevoking ? "revokeUsers" : "restoreUsers";
return this.i18nService.t(titleKey);
}
@@ -42,7 +42,7 @@ export class BulkDeactivateComponent {
try {
const response = await this.performBulkUserAction();
- const bulkMessage = this.isDeactivating ? "bulkRevokedMessage" : "bulkRestoredMessage";
+ const bulkMessage = this.isRevoking ? "bulkRevokedMessage" : "bulkRestoredMessage";
response.data.forEach((entry) => {
const error = entry.error !== "" ? entry.error : this.i18nService.t(bulkMessage);
this.statuses.set(entry.id, error);
@@ -57,10 +57,10 @@ export class BulkDeactivateComponent {
protected async performBulkUserAction() {
const request = new OrganizationUserBulkRequest(this.users.map((user) => user.id));
- if (this.isDeactivating) {
- return await this.apiService.deactivateManyOrganizationUsers(this.organizationId, request);
+ if (this.isRevoking) {
+ return await this.apiService.revokeManyOrganizationUsers(this.organizationId, request);
} else {
- return await this.apiService.activateManyOrganizationUsers(this.organizationId, request);
+ return await this.apiService.restoreManyOrganizationUsers(this.organizationId, request);
}
}
}
diff --git a/apps/web/src/app/organizations/manage/people.component.html b/apps/web/src/app/organizations/manage/people.component.html
index d9c981ca733..ff583bcf36b 100644
--- a/apps/web/src/app/organizations/manage/people.component.html
+++ b/apps/web/src/app/organizations/manage/people.component.html
@@ -32,11 +32,11 @@
+
diff --git a/libs/components/src/modal/modal-simple.component.ts b/libs/components/src/modal/modal-simple.component.ts
new file mode 100644
index 00000000000..b083e784cf7
--- /dev/null
+++ b/libs/components/src/modal/modal-simple.component.ts
@@ -0,0 +1,16 @@
+import { Component, ContentChild, Directive } from "@angular/core";
+
+@Directive({ selector: "[bit-modal-icon]" })
+export class IconDirective {}
+
+@Component({
+ selector: "bit-simple-modal",
+ templateUrl: "./modal-simple.component.html",
+})
+export class ModalSimpleComponent {
+ @ContentChild(IconDirective) icon!: IconDirective;
+
+ get hasIcon() {
+ return this.icon != null;
+ }
+}
diff --git a/libs/components/src/modal/modal-simple.stories.ts b/libs/components/src/modal/modal-simple.stories.ts
new file mode 100644
index 00000000000..5f28e63bb00
--- /dev/null
+++ b/libs/components/src/modal/modal-simple.stories.ts
@@ -0,0 +1,85 @@
+import { Meta, moduleMetadata, Story } from "@storybook/angular";
+
+import { ButtonModule } from "../button";
+
+import { IconDirective, ModalSimpleComponent } from "./modal-simple.component";
+
+export default {
+ title: "Component Library/Modals/Simple Modal",
+ component: ModalSimpleComponent,
+ decorators: [
+ moduleMetadata({
+ imports: [ButtonModule],
+ declarations: [IconDirective],
+ }),
+ ],
+ parameters: {
+ design: {
+ type: "figma",
+ url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library",
+ },
+ },
+} as Meta;
+
+const Template: Story
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
diff --git a/libs/components/src/modal/modal.component.ts b/libs/components/src/modal/modal.component.ts
new file mode 100644
index 00000000000..208929bf024
--- /dev/null
+++ b/libs/components/src/modal/modal.component.ts
@@ -0,0 +1,23 @@
+import { Component, Input } from "@angular/core";
+
+@Component({
+ selector: "bit-modal",
+ templateUrl: "./modal.component.html",
+})
+export class ModalComponent {
+ @Input() modalSize: "small" | "default" | "large";
+
+ get width() {
+ switch (this.modalSize) {
+ case "small": {
+ return "tw-max-w-xs";
+ }
+ case "large": {
+ return "tw-max-w-4xl";
+ }
+ default: {
+ return "tw-max-w-xl";
+ }
+ }
+ }
+}
diff --git a/libs/components/src/modal/modal.module.ts b/libs/components/src/modal/modal.module.ts
new file mode 100644
index 00000000000..340a6b2deed
--- /dev/null
+++ b/libs/components/src/modal/modal.module.ts
@@ -0,0 +1,12 @@
+import { CommonModule } from "@angular/common";
+import { NgModule } from "@angular/core";
+
+import { ModalSimpleComponent } from "./modal-simple.component";
+import { ModalComponent } from "./modal.component";
+
+@NgModule({
+ imports: [CommonModule],
+ exports: [ModalComponent, ModalSimpleComponent],
+ declarations: [ModalComponent, ModalSimpleComponent],
+})
+export class ModalModule {}
diff --git a/libs/components/src/modal/modal.stories.ts b/libs/components/src/modal/modal.stories.ts
new file mode 100644
index 00000000000..6225dbe6aa3
--- /dev/null
+++ b/libs/components/src/modal/modal.stories.ts
@@ -0,0 +1,80 @@
+import { Meta, moduleMetadata, Story } from "@storybook/angular";
+
+import { ButtonModule } from "../button";
+
+import { ModalComponent } from "./modal.component";
+
+export default {
+ title: "Component Library/Modals/Modal",
+ component: ModalComponent,
+ decorators: [
+ moduleMetadata({
+ imports: [ButtonModule],
+ }),
+ ],
+ args: {
+ modalSize: "small",
+ },
+ parameters: {
+ design: {
+ type: "figma",
+ url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library",
+ },
+ },
+} as Meta;
+
+const Template: Story
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+