Browse Source

[CL-298] chore: some renaming

CL-298-async-actions-2-0-context-string
Andreas Coroiu 2 years ago
parent
commit
7f57bc32ca
No known key found for this signature in database
GPG Key ID: E70B5FFC81DFEC1A
  1. 4
      libs/components/src/async-actions/async-actions.module.ts
  2. 2
      libs/components/src/async-actions/async-context-provider.abstraction.ts
  3. 12
      libs/components/src/async-actions/async-context.directive.ts
  4. 4
      libs/components/src/async-actions/bit-action.directive.ts
  5. 12
      libs/components/src/async-actions/context-provider.directive.ts
  6. 6
      libs/components/src/async-actions/form-button.directive.ts
  7. 4
      libs/components/src/async-actions/standalone.stories.ts

4
libs/components/src/async-actions/async-actions.module.ts

@ -2,9 +2,9 @@ import { NgModule } from "@angular/core"; @@ -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"; @@ -13,7 +13,7 @@ import { BitFormButtonDirective } from "./form-button.directive";
BitActionDirective,
BitFormButtonDirective,
BitSubmitDirective,
BitContextProviderDirective,
BitAsyncContextDirective,
],
exports: [BitActionDirective, BitFormButtonDirective, BitSubmitDirective],
})

2
libs/components/src/async-actions/context-provider.abstraction.ts → libs/components/src/async-actions/async-context-provider.abstraction.ts

@ -5,6 +5,6 @@ @@ -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;
}

12
libs/components/src/async-actions/async-context.directive.ts

@ -0,0 +1,12 @@ @@ -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;
}

4
libs/components/src/async-actions/bit-action.directive.ts

@ -7,7 +7,7 @@ import { ButtonLikeAbstraction } from "../shared/button-like.abstraction"; @@ -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 { @@ -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 {

12
libs/components/src/async-actions/context-provider.directive.ts

@ -1,12 +0,0 @@ @@ -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;
}

6
libs/components/src/async-actions/form-button.directive.ts

@ -3,8 +3,8 @@ import { Subject, takeUntil } from "rxjs"; @@ -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"; @@ -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<void>();
@Input("bitAction") private bitAction: unknown;

4
libs/components/src/async-actions/standalone.stories.ts

@ -9,8 +9,8 @@ import { ValidationService } from "@bitwarden/common/platform/abstractions/valid @@ -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 = `
<button bitButton buttonType="primary" [bitAction]="action" class="tw-mr-2">
@ -58,7 +58,7 @@ export default { @@ -58,7 +58,7 @@ export default {
moduleMetadata({
declarations: [
BitActionDirective,
BitContextProviderDirective,
BitAsyncContextDirective,
PromiseExampleComponent,
ObservableExampleComponent,
RejectedPromiseExampleComponent,

Loading…
Cancel
Save