From 7f57bc32cad54709a1a355589ac7149684e58619 Mon Sep 17 00:00:00 2001 From: Andreas Coroiu Date: Wed, 29 May 2024 10:53:25 +0200 Subject: [PATCH] [CL-298] chore: some renaming --- .../src/async-actions/async-actions.module.ts | 4 ++-- ...tion.ts => async-context-provider.abstraction.ts} | 2 +- .../src/async-actions/async-context.directive.ts | 12 ++++++++++++ .../src/async-actions/bit-action.directive.ts | 4 ++-- .../src/async-actions/context-provider.directive.ts | 12 ------------ .../src/async-actions/form-button.directive.ts | 6 +++--- .../src/async-actions/standalone.stories.ts | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) rename libs/components/src/async-actions/{context-provider.abstraction.ts => async-context-provider.abstraction.ts} (90%) create mode 100644 libs/components/src/async-actions/async-context.directive.ts delete mode 100644 libs/components/src/async-actions/context-provider.directive.ts diff --git a/libs/components/src/async-actions/async-actions.module.ts b/libs/components/src/async-actions/async-actions.module.ts index b9d461a3517..7ebe31c67c1 100644 --- a/libs/components/src/async-actions/async-actions.module.ts +++ b/libs/components/src/async-actions/async-actions.module.ts @@ -2,9 +2,9 @@ import { NgModule } from "@angular/core"; import { SharedModule } from "../shared"; +import { BitAsyncContextDirective } from "./async-context.directive"; import { BitActionDirective } from "./bit-action.directive"; import { BitSubmitDirective } from "./bit-submit.directive"; -import { BitContextProviderDirective } from "./context-provider.directive"; import { BitFormButtonDirective } from "./form-button.directive"; @NgModule({ @@ -13,7 +13,7 @@ import { BitFormButtonDirective } from "./form-button.directive"; BitActionDirective, BitFormButtonDirective, BitSubmitDirective, - BitContextProviderDirective, + BitAsyncContextDirective, ], exports: [BitActionDirective, BitFormButtonDirective, BitSubmitDirective], }) diff --git a/libs/components/src/async-actions/context-provider.abstraction.ts b/libs/components/src/async-actions/async-context-provider.abstraction.ts similarity index 90% rename from libs/components/src/async-actions/context-provider.abstraction.ts rename to libs/components/src/async-actions/async-context-provider.abstraction.ts index c33943b654d..5e09a252ef8 100644 --- a/libs/components/src/async-actions/context-provider.abstraction.ts +++ b/libs/components/src/async-actions/async-context-provider.abstraction.ts @@ -5,6 +5,6 @@ * the currently active action displays a loading state, while other buttons in the * same context are disabled. */ -export abstract class ContextProvider { +export abstract class AsyncContextProvider { abstract readonly context: string; } diff --git a/libs/components/src/async-actions/async-context.directive.ts b/libs/components/src/async-actions/async-context.directive.ts new file mode 100644 index 00000000000..e9bf41ede92 --- /dev/null +++ b/libs/components/src/async-actions/async-context.directive.ts @@ -0,0 +1,12 @@ +import { Directive, Input } from "@angular/core"; + +import { AsyncContextProvider } from "./async-context-provider.abstraction"; + +@Directive({ + selector: "[bitAction][context]", + providers: [{ provide: AsyncContextProvider, useExisting: BitAsyncContextDirective }], +}) +export class BitAsyncContextDirective implements AsyncContextProvider { + @Input({ required: true }) + context: string; +} diff --git a/libs/components/src/async-actions/bit-action.directive.ts b/libs/components/src/async-actions/bit-action.directive.ts index b4bc0374def..b12f8864184 100644 --- a/libs/components/src/async-actions/bit-action.directive.ts +++ b/libs/components/src/async-actions/bit-action.directive.ts @@ -7,7 +7,7 @@ import { ButtonLikeAbstraction } from "../shared/button-like.abstraction"; import { FunctionReturningAwaitable } from "../utils/function-to-observable"; import { AsyncActionsService } from "./async-actions.service"; -import { ContextProvider } from "./context-provider.abstraction"; +import { AsyncContextProvider } from "./async-context-provider.abstraction"; type State = "idle" | "loading" | "disabled"; @@ -29,7 +29,7 @@ export class BitActionDirective implements OnInit, OnDestroy { constructor( private buttonComponent: ButtonLikeAbstraction, private asyncActionsService: AsyncActionsService, - @Optional() private contextProvider?: ContextProvider, + @Optional() private contextProvider?: AsyncContextProvider, ) {} ngOnInit(): void { diff --git a/libs/components/src/async-actions/context-provider.directive.ts b/libs/components/src/async-actions/context-provider.directive.ts deleted file mode 100644 index ba1270b99d0..00000000000 --- a/libs/components/src/async-actions/context-provider.directive.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Directive, Input } from "@angular/core"; - -import { ContextProvider } from "./context-provider.abstraction"; - -@Directive({ - selector: "[bitAction][context]", - providers: [{ provide: ContextProvider, useExisting: BitContextProviderDirective }], -}) -export class BitContextProviderDirective implements ContextProvider { - @Input({ required: true }) - context: string; -} diff --git a/libs/components/src/async-actions/form-button.directive.ts b/libs/components/src/async-actions/form-button.directive.ts index 44ba9011be0..cd38d582a2e 100644 --- a/libs/components/src/async-actions/form-button.directive.ts +++ b/libs/components/src/async-actions/form-button.directive.ts @@ -3,8 +3,8 @@ import { Subject, takeUntil } from "rxjs"; import { ButtonLikeAbstraction } from "../shared/button-like.abstraction"; +import { AsyncContextProvider } from "./async-context-provider.abstraction"; import { BitSubmitDirective } from "./bit-submit.directive"; -import { ContextProvider } from "./context-provider.abstraction"; /** * This directive has two purposes: @@ -22,9 +22,9 @@ import { ContextProvider } from "./context-provider.abstraction"; */ @Directive({ selector: "button[bitFormButton]", - providers: [{ provide: ContextProvider, useExisting: BitFormButtonDirective }], + providers: [{ provide: AsyncContextProvider, useExisting: BitFormButtonDirective }], }) -export class BitFormButtonDirective implements ContextProvider, OnInit, OnDestroy { +export class BitFormButtonDirective implements AsyncContextProvider, OnInit, OnDestroy { private destroy$ = new Subject(); @Input("bitAction") private bitAction: unknown; diff --git a/libs/components/src/async-actions/standalone.stories.ts b/libs/components/src/async-actions/standalone.stories.ts index 6e6a77d720d..5b9427f873f 100644 --- a/libs/components/src/async-actions/standalone.stories.ts +++ b/libs/components/src/async-actions/standalone.stories.ts @@ -9,8 +9,8 @@ import { ValidationService } from "@bitwarden/common/platform/abstractions/valid import { ButtonModule } from "../button"; import { IconButtonModule } from "../icon-button"; +import { BitAsyncContextDirective } from "./async-context.directive"; import { BitActionDirective } from "./bit-action.directive"; -import { BitContextProviderDirective } from "./context-provider.directive"; const template = `