diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.html b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.html index 1d45140a6b337ec1df5164b76216ba8768f9542e..8d00b44b3737090091e15a34e731f4168b12b601 100644 --- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.html +++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.html @@ -25,7 +25,7 @@ data-test-id="organisationseinheit-save-button" class="justify-self-end" (clickEmitter)="submit()" - [progress]="submitInProgress$ | async" + [submitInProgress]="submitInProgress$ | async" label="Speichern" > </admin-primary-button> diff --git a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts index b8ab4fc50084162e18e59d0f50ef4f3b0a95146d..9e1f39437be6685174546f19c2f00e1307870c6f 100644 --- a/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts +++ b/alfa-client/libs/admin-settings/src/lib/organisationseinheit/organisationseinheit-container/organisationseinheit-form/organisationseinheit-form.component.spec.ts @@ -117,7 +117,7 @@ describe('OrganisationseinheitFormComponent', () => { fixture.detectChanges(); - expect(saveButtonComponent.progress).toBe(true); + expect(saveButtonComponent.submitInProgress).toBe(true); }); it('should be enabled while not in progress', () => { @@ -125,7 +125,7 @@ describe('OrganisationseinheitFormComponent', () => { fixture.detectChanges(); - expect(saveButtonComponent.progress).toBe(false); + expect(saveButtonComponent.submitInProgress).toBe(false); }); }); @@ -165,7 +165,7 @@ describe('OrganisationseinheitFormComponent', () => { fixture, saveButtonSelector, ).componentInstance; - expect(saveButtonComponent.progress).toBe(progress); + expect(saveButtonComponent.submitInProgress).toBe(progress); }); }); diff --git a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.html b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.html index 55fa33b08d26880ead5ed61adfafc2f5094a9a53..5ebfbc7da60ca54abbabb4135ce809216b274f88 100644 --- a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.html +++ b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.html @@ -44,7 +44,7 @@ <admin-primary-button (clickEmitter)="submit()" - [progress]="this.submitInProgress$ | async" + [submitInProgress]="this.submitInProgress$ | async" data-test-id="save-button" label="Speichern" ></admin-primary-button> diff --git a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts index fbc4e6700319eaae1396e7136e08b0ad2f17dc33..0ed5a578cffd1ea48f5200d7d17a7b1b94c079c5 100644 --- a/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts +++ b/alfa-client/libs/admin-settings/src/lib/postfach/postfach-container/postfach-form/postfach-form.component.spec.ts @@ -164,7 +164,7 @@ describe('PostfachFormComponent', () => { fixture, saveButtonSelector, ).componentInstance; - expect(saveButtonComponent.progress).toBe(progress); + expect(saveButtonComponent.submitInProgress).toBe(progress); }); }); diff --git a/alfa-client/libs/admin-settings/src/lib/shared/primary-button/primary-button.component.html b/alfa-client/libs/admin-settings/src/lib/shared/primary-button/primary-button.component.html index bbb9a3cc4fce6ac98bacb1a89de99981e3940655..d5e7731728de024e1aeba9f9dbfaa4c86728fe0d 100644 --- a/alfa-client/libs/admin-settings/src/lib/shared/primary-button/primary-button.component.html +++ b/alfa-client/libs/admin-settings/src/lib/shared/primary-button/primary-button.component.html @@ -1,11 +1,11 @@ <button (click)="clickEmitter.emit($event)" - [disabled]="progress" + [disabled]="submitInProgress" type="button" class="me-2 inline-flex items-center rounded-lg bg-ozgblue-700 px-5 py-2.5 text-center text-sm font-medium text-white hover:bg-ozgblue-800 focus:ring-4 focus:ring-ozgblue-300 active:bg-ozgblue-600/90 disabled:bg-ozgblue-600/50 dark:bg-ozgblue-600 dark:hover:bg-ozgblue-700 dark:focus:ring-ozgblue-800" > <svg - *ngIf="progress" + *ngIf="submitInProgress" aria-hidden="true" role="status" class="me-3 inline h-4 w-4 animate-spin text-white" diff --git a/alfa-client/libs/admin-settings/src/lib/shared/primary-button/primary-button.component.ts b/alfa-client/libs/admin-settings/src/lib/shared/primary-button/primary-button.component.ts index 03e2f6525f0a0321510e4f2ee6f92e904f856e2b..365dd569dae6f5a1cf82c94eab2215c70249b815 100644 --- a/alfa-client/libs/admin-settings/src/lib/shared/primary-button/primary-button.component.ts +++ b/alfa-client/libs/admin-settings/src/lib/shared/primary-button/primary-button.component.ts @@ -9,7 +9,7 @@ export class PrimaryButtonComponent { clickEmitter: EventEmitter<MouseEvent> = new EventEmitter<MouseEvent>(); @Input() - progress: boolean; + submitInProgress: boolean; @Input() label: string;