From 7d4064b56ff8b9a48c7abf0b3cdb8c6ac998be43 Mon Sep 17 00:00:00 2001
From: "Zickermann, Jan" <jan.zickermann@dataport.de>
Date: Tue, 26 Mar 2024 17:03:10 +0100
Subject: [PATCH] OZG-4995 Rename `progress` to `submitInProgress`
---
.../organisationseinheit-form.component.html | 2 +-
.../organisationseinheit-form.component.spec.ts | 6 +++---
.../postfach-form/postfach-form.component.html | 2 +-
.../postfach-form/postfach-form.component.spec.ts | 2 +-
.../lib/shared/primary-button/primary-button.component.html | 4 ++--
.../lib/shared/primary-button/primary-button.component.ts | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
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 1d45140a6b..8d00b44b37 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 b8ab4fc500..9e1f39437b 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 55fa33b08d..5ebfbc7da6 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 fbc4e67003..0ed5a578cf 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 bbb9a3cc4f..d5e7731728 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 03e2f6525f..365dd569da 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;
--
GitLab