From 1495b06736d5418afa1e7c41e610d9957e7c091b Mon Sep 17 00:00:00 2001 From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:52:55 +0200 Subject: [PATCH] Move send icons to @bitwarden/send-ui (#9840) Co-authored-by: Daniel James Smith --- apps/web/src/app/tools/send/access.component.ts | 4 ++-- apps/web/src/app/tools/send/send.component.ts | 4 ++-- libs/tools/send/send-ui/package.json | 3 ++- .../tools/send/send-ui/src}/icons/expired-send.icon.ts | 2 +- libs/tools/send/send-ui/src/icons/index.ts | 2 ++ .../tools/send/send-ui/src}/icons/no-send.icon.ts | 2 +- libs/tools/send/send-ui/src/index.ts | 1 + 7 files changed, 11 insertions(+), 7 deletions(-) rename {apps/web/src/app/tools/send => libs/tools/send/send-ui/src}/icons/expired-send.icon.ts (98%) create mode 100644 libs/tools/send/send-ui/src/icons/index.ts rename {apps/web/src/app/tools/send => libs/tools/send/send-ui/src}/icons/no-send.icon.ts (98%) diff --git a/apps/web/src/app/tools/send/access.component.ts b/apps/web/src/app/tools/send/access.component.ts index 64e46b3ff5..cd6850c785 100644 --- a/apps/web/src/app/tools/send/access.component.ts +++ b/apps/web/src/app/tools/send/access.component.ts @@ -18,10 +18,10 @@ import { SendAccessView } from "@bitwarden/common/tools/send/models/view/send-ac import { SEND_KDF_ITERATIONS } from "@bitwarden/common/tools/send/send-kdf"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { NoItemsModule, ToastService } from "@bitwarden/components"; +import { ExpiredSendIcon } from "@bitwarden/send-ui"; import { SharedModule } from "../../shared"; -import { ExpiredSend } from "./icons/expired-send.icon"; import { SendAccessFileComponent } from "./send-access-file.component"; import { SendAccessPasswordComponent } from "./send-access-password.component"; import { SendAccessTextComponent } from "./send-access-text.component"; @@ -51,7 +51,7 @@ export class AccessComponent implements OnInit { protected hideEmail = false; protected decKey: SymmetricCryptoKey; protected accessRequest: SendAccessRequest; - protected expiredSendIcon = ExpiredSend; + protected expiredSendIcon = ExpiredSendIcon; protected formGroup = this.formBuilder.group({}); diff --git a/apps/web/src/app/tools/send/send.component.ts b/apps/web/src/app/tools/send/send.component.ts index 56f7734ca1..dad09ef70a 100644 --- a/apps/web/src/app/tools/send/send.component.ts +++ b/apps/web/src/app/tools/send/send.component.ts @@ -19,12 +19,12 @@ import { TableDataSource, ToastService, } from "@bitwarden/components"; +import { NoSendsIcon } from "@bitwarden/send-ui"; import { HeaderModule } from "../../layouts/header/header.module"; import { SharedModule } from "../../shared"; import { AddEditComponent } from "./add-edit.component"; -import { NoSend } from "./icons/no-send.icon"; const BroadcasterSubscriptionId = "SendComponent"; @@ -37,7 +37,7 @@ const BroadcasterSubscriptionId = "SendComponent"; export class SendComponent extends BaseSendComponent { @ViewChild("sendAddEdit", { read: ViewContainerRef, static: true }) sendAddEditModalRef: ViewContainerRef; - noItemIcon = NoSend; + noItemIcon = NoSendsIcon; override set filteredSends(filteredSends: SendView[]) { super.filteredSends = filteredSends; diff --git a/libs/tools/send/send-ui/package.json b/libs/tools/send/send-ui/package.json index 81bbbde435..4ffa4db0bd 100644 --- a/libs/tools/send/send-ui/package.json +++ b/libs/tools/send/send-ui/package.json @@ -18,6 +18,7 @@ "build:watch": "npm run clean && tsc -watch" }, "dependencies": { - "@bitwarden/common": "file:../../../common" + "@bitwarden/common": "file:../../../common", + "@bitwarden/components": "file:../../../components" } } diff --git a/apps/web/src/app/tools/send/icons/expired-send.icon.ts b/libs/tools/send/send-ui/src/icons/expired-send.icon.ts similarity index 98% rename from apps/web/src/app/tools/send/icons/expired-send.icon.ts rename to libs/tools/send/send-ui/src/icons/expired-send.icon.ts index 3ce0856a26..c699a544e7 100644 --- a/apps/web/src/app/tools/send/icons/expired-send.icon.ts +++ b/libs/tools/send/send-ui/src/icons/expired-send.icon.ts @@ -1,6 +1,6 @@ import { svgIcon } from "@bitwarden/components"; -export const ExpiredSend = svgIcon` +export const ExpiredSendIcon = svgIcon` diff --git a/libs/tools/send/send-ui/src/icons/index.ts b/libs/tools/send/send-ui/src/icons/index.ts new file mode 100644 index 0000000000..a2428e5633 --- /dev/null +++ b/libs/tools/send/send-ui/src/icons/index.ts @@ -0,0 +1,2 @@ +export { NoSendsIcon } from "./no-send.icon"; +export { ExpiredSendIcon } from "./expired-send.icon"; diff --git a/apps/web/src/app/tools/send/icons/no-send.icon.ts b/libs/tools/send/send-ui/src/icons/no-send.icon.ts similarity index 98% rename from apps/web/src/app/tools/send/icons/no-send.icon.ts rename to libs/tools/send/send-ui/src/icons/no-send.icon.ts index f5494a4b3c..f3d06d0cfd 100644 --- a/apps/web/src/app/tools/send/icons/no-send.icon.ts +++ b/libs/tools/send/send-ui/src/icons/no-send.icon.ts @@ -1,6 +1,6 @@ import { svgIcon } from "@bitwarden/components"; -export const NoSend = svgIcon` +export const NoSendsIcon = svgIcon` diff --git a/libs/tools/send/send-ui/src/index.ts b/libs/tools/send/send-ui/src/index.ts index e69de29bb2..6ef8d54d41 100644 --- a/libs/tools/send/send-ui/src/index.ts +++ b/libs/tools/send/send-ui/src/index.ts @@ -0,0 +1 @@ +export * from "./icons";