diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
index 05a83a1c4861aaf65fd48d1d90c9d4873f680175..1bb8e644829d9f5e7627f8c4aa40b09e2c43e86c 100644
--- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
+++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
@@ -19,7 +19,7 @@ import {
createStateResource,
filterIsLoadedOrHasError,
getEmbeddedResources,
- hasStateResourceError,
+ hasError,
isLoaded,
isNotEmpty,
sortByGermanDateStr,
@@ -353,7 +353,7 @@ export class BescheidService {
bescheid: BescheidResource,
binaryFileStateResource: StateResource<BinaryFileResource>,
): void {
- if (hasStateResourceError(binaryFileStateResource)) {
+ if (hasError(binaryFileStateResource)) {
this.setUploadBescheidDocumentInProgressError(binaryFileStateResource.error);
} else {
this.createBescheidDocumentFromFile(bescheid, binaryFileStateResource.resource);
@@ -373,7 +373,7 @@ export class BescheidService {
commandStateResource: StateResource<CommandResource>,
binaryFile: BinaryFileResource,
): void {
- if (hasStateResourceError(commandStateResource)) {
+ if (hasError(commandStateResource)) {
this.setUploadBescheidDocumentInProgressError(commandStateResource.error);
} else {
this.bescheidDocument$.next(createEmptyStateResource());
@@ -425,7 +425,7 @@ export class BescheidService {
private handleCreateBescheidDocumentResponse(
commandStateResource: StateResource<CommandResource>,
): void {
- if (hasStateResourceError(commandStateResource)) {
+ if (hasError(commandStateResource)) {
this.setCreateBescheidDocumentInProgressError(commandStateResource.error);
} else {
const documentUri: ResourceUri = getEffectedResourceUrl(commandStateResource.resource);
@@ -546,7 +546,7 @@ export class BescheidService {
}
handleAttachmentUpload(binaryFileStateResource: StateResource<BinaryFileResource>) {
- if (hasStateResourceError(binaryFileStateResource)) {
+ if (hasError(binaryFileStateResource)) {
this.uploadAttachmentInProgress$.next({
loading: false,
error: binaryFileStateResource.error,
diff --git a/alfa-client/libs/command-shared/src/lib/+state/command.effects.ts b/alfa-client/libs/command-shared/src/lib/+state/command.effects.ts
index e2216c9de04db4175cde8934f30b20c0ae0fb15b..d9521a3ab95f6879515b7b398392fb57f2095d7c 100644
--- a/alfa-client/libs/command-shared/src/lib/+state/command.effects.ts
+++ b/alfa-client/libs/command-shared/src/lib/+state/command.effects.ts
@@ -1,21 +1,14 @@
-import { EMPTY_STRING } from '@alfa-client/tech-shared';
-import { SnackBarService } from '@alfa-client/ui';
import { Injectable } from '@angular/core';
+import { SnackBarService } from '@alfa-client/ui';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { Store } from '@ngrx/store';
import { TypedAction } from '@ngrx/store/src/models';
-import { isEqual, isUndefined } from 'lodash-es';
import { of } from 'rxjs';
import { catchError, delay, map, mergeMap, switchMap, tap } from 'rxjs/operators';
import { COMMAND_ERROR_MESSAGES, CREATE_COMMAND_MESSAGE_BY_ORDER } from '../command.message';
import { CommandListResource, CommandResource, CreateCommandProps } from '../command.model';
import { CommandRepository } from '../command.repository';
-import {
- hasCommandError,
- isConcurrentModification,
- isPending,
- isRevokeable,
-} from '../command.util';
+import { hasError, isConcurrentModification, isPending, isRevokeable } from '../command.util';
import {
CommandProps,
LoadCommandListProps,
@@ -34,6 +27,8 @@ import {
showRevokeSnackbar,
showSnackbar,
} from './command.actions';
+import { isEqual, isUndefined } from 'lodash-es';
+import { EMPTY_STRING } from '@alfa-client/tech-shared';
@Injectable()
export class CommandEffects {
@@ -102,7 +97,7 @@ export class CommandEffects {
if (isRevokeable(command)) {
return [createCommandSuccess({ command }), showRevokeSnackbar({ command })];
}
- if (hasCommandError(command) && isConcurrentModification(command.errorMessage)) {
+ if (hasError(command) && isConcurrentModification(command.errorMessage)) {
this.showError(command);
return [createCommandSuccess({ command }), publishConcurrentModificationAction()];
}
diff --git a/alfa-client/libs/command-shared/src/lib/command.util.spec.ts b/alfa-client/libs/command-shared/src/lib/command.util.spec.ts
index 7567dbc61f0de2a129af59416b91e373ace7e40d..cd3f65d6bda037c9552175f7b5c81cdfc821b70c 100644
--- a/alfa-client/libs/command-shared/src/lib/command.util.spec.ts
+++ b/alfa-client/libs/command-shared/src/lib/command.util.spec.ts
@@ -31,7 +31,7 @@ import { CommandErrorMessage } from './command.message';
import { CommandListResource, CommandResource } from './command.model';
import {
getPendingCommandByOrder,
- hasCommandError,
+ hasError,
isConcurrentModification,
isDone,
isPending,
@@ -81,19 +81,19 @@ describe('CommandUtil', () => {
describe('hasError', () => {
it('should be true if no update link is present and command has error message', () => {
- const result = hasCommandError(createCommandErrorResource());
+ const result = hasError(createCommandErrorResource());
expect(result).toBeTruthy();
});
it('should be false if update link is present', () => {
- const result = hasCommandError(createCommandResource([CommandLinkRel.UPDATE]));
+ const result = hasError(createCommandResource([CommandLinkRel.UPDATE]));
expect(result).toBeFalsy();
});
it('should be false if error message is not present', () => {
- const result = hasCommandError(createCommandResource());
+ const result = hasError(createCommandResource());
expect(result).toBeFalsy();
});
diff --git a/alfa-client/libs/command-shared/src/lib/command.util.ts b/alfa-client/libs/command-shared/src/lib/command.util.ts
index 2dc64f425d39048734607a64cc12b984a47f3c03..8132a7d316e04b69db6af9aa5360895f5b4ae406 100644
--- a/alfa-client/libs/command-shared/src/lib/command.util.ts
+++ b/alfa-client/libs/command-shared/src/lib/command.util.ts
@@ -43,7 +43,7 @@ export function hasErrorMessage(commandResource: CommandResource): boolean {
return !isNil(commandResource.errorMessage) && !isEmpty(commandResource.errorMessage);
}
-export function hasCommandError(commandResource: CommandResource): boolean {
+export function hasError(commandResource: CommandResource): boolean {
return hasErrorMessage(commandResource) && !isPending(commandResource);
}
@@ -73,7 +73,7 @@ export function isConcurrentModification(errorMessage: string): boolean {
}
export function isSuccessfulDone(commandResource: CommandResource): boolean {
- return isDone(commandResource) && !hasCommandError(commandResource);
+ return isDone(commandResource) && !hasError(commandResource);
}
export function getEffectedResourceUrl(command: CommandResource): ResourceUri {
diff --git a/alfa-client/libs/forwarding-shared/src/lib/forwarding.service.ts b/alfa-client/libs/forwarding-shared/src/lib/forwarding.service.ts
index fd5032a426609ed8a3fa4714958d55929d190d28..c425ea44e5bb2ef00586dd52fbf41cfb7af75e4b 100644
--- a/alfa-client/libs/forwarding-shared/src/lib/forwarding.service.ts
+++ b/alfa-client/libs/forwarding-shared/src/lib/forwarding.service.ts
@@ -21,6 +21,8 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { Injectable, OnDestroy } from '@angular/core';
+import { Params } from '@angular/router';
import {
CommandResource,
CommandService,
@@ -33,7 +35,7 @@ import {
StateResource,
createEmptyStateResource,
createStateResource,
- hasStateResourceError,
+ hasError,
} from '@alfa-client/tech-shared';
import {
ForwardRequest,
@@ -43,8 +45,6 @@ import {
VorgangWithEingangResource,
createForwardCommand,
} from '@alfa-client/vorgang-shared';
-import { Injectable, OnDestroy } from '@angular/core';
-import { Params } from '@angular/router';
import { isNil } from 'lodash-es';
import { BehaviorSubject, Observable, Subscription } from 'rxjs';
import { first, map, startWith, tap } from 'rxjs/operators';
@@ -162,7 +162,7 @@ export class ForwardingService implements OnDestroy {
}
reloadCurrentVorgang(command: StateResource<CommandResource>): void {
- if (!hasStateResourceError(command)) {
+ if (!hasError(command)) {
this.vorgangService.reloadCurrentVorgang();
}
}
diff --git a/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts b/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts
index f4bc26e4687c2ce05b1cc7b3d36560b76a5a21df..dec067e551da7b7af88fdfdaf84bae1997f9b400 100644
--- a/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts
+++ b/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts
@@ -31,7 +31,7 @@ import {
CommandResource,
CommandService,
doIfCommandIsDone,
- hasCommandError,
+ hasError,
isDone,
isPending,
} from '@alfa-client/command-shared';
@@ -152,7 +152,7 @@ export class PostfachService {
}
private showSnackbar(commandResource: CommandResource): void {
- if (hasCommandError(commandResource)) {
+ if (hasError(commandResource)) {
this.snackbarService.showError(PostfachMessages.SEND_FAILED);
} else {
this.snackbarService.show(commandResource, PostfachMessages.SEND_SUCCESSFUL);
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button-container.component.ts b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button-container.component.ts
index 3982398bb0214d82582c134a8265b18e893d4b11..6a4d16d49caa38d8901b8f352fded1be89bd7b59 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button-container.component.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button-container.component.ts
@@ -28,12 +28,7 @@ import {
PostfachMailListResource,
PostfachService,
} from '@alfa-client/postfach-shared';
-import {
- StateResource,
- hasStateResourceError,
- isNotNull,
- isNotUndefined,
-} from '@alfa-client/tech-shared';
+import { StateResource, hasError, isNotNull, isNotUndefined } from '@alfa-client/tech-shared';
import { DialogService, FixedDialogComponent } from '@alfa-client/ui';
import { VorgangHeaderLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { getEmpfaenger } from '@alfa-client/vorgang-shared-ui';
@@ -94,7 +89,7 @@ export class PostfachMailButtonContainerComponent {
closeDialog(commandStateResource: StateResource<CommandResource>): void {
if (
- !hasStateResourceError(commandStateResource) &&
+ !hasError(commandStateResource) &&
commandStateResource.loaded &&
isNotUndefined(this.dialogRef)
) {
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.rxjs.operator.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.rxjs.operator.ts
index 94366fd512a16a42da80ead120f2eadadd5326ef..b7bc23b1732d5ce0f2e3c5a941acde157a18b0e5 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/resource.rxjs.operator.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.rxjs.operator.ts
@@ -1,6 +1,6 @@
import { Resource } from '@ngxp/rest';
import { Observable, filter, map } from 'rxjs';
-import { StateResource, hasStateResourceError, isLoaded } from './resource.util';
+import { StateResource, hasError, isLoaded } from './resource.util';
export function filterIsLoadedOrHasError<T>(): (
source: Observable<StateResource<T>>,
@@ -8,8 +8,7 @@ export function filterIsLoadedOrHasError<T>(): (
return (source: Observable<StateResource<T>>): Observable<StateResource<T>> => {
return source.pipe(
filter(
- (stateResource: StateResource<T>) =>
- hasStateResourceError(stateResource) || isLoaded(stateResource),
+ (stateResource: StateResource<T>) => hasError(stateResource) || isLoaded(stateResource),
),
);
};
diff --git a/alfa-client/libs/tech-shared/src/lib/resource/resource.util.ts b/alfa-client/libs/tech-shared/src/lib/resource/resource.util.ts
index 17394d5b91f600d6882f82fca324a97cdb046449..deaa71132a606f656d62efd87deded4ba3e71f2b 100644
--- a/alfa-client/libs/tech-shared/src/lib/resource/resource.util.ts
+++ b/alfa-client/libs/tech-shared/src/lib/resource/resource.util.ts
@@ -69,7 +69,7 @@ export function isLoaded<T>(stateResource: StateResource<T>): boolean {
return !stateResource.loading && !stateResource.reload && isNotNull(stateResource.resource);
}
-export function hasStateResourceError(stateResource: StateResource<any>): boolean {
+export function hasError(stateResource: StateResource<any>): boolean {
return !isNil(stateResource.error);
}
@@ -115,7 +115,7 @@ export function getSuccessfullyLoaded<T extends Resource>(
stateResources: StateResource<T>[],
): StateResource<T>[] {
return stateResources.filter(
- (stateResource) => isLoaded(stateResource) && !hasStateResourceError(stateResource),
+ (stateResource) => isLoaded(stateResource) && !hasError(stateResource),
);
}
diff --git a/alfa-client/libs/tech-shared/src/lib/service/formservice.abstract.ts b/alfa-client/libs/tech-shared/src/lib/service/formservice.abstract.ts
index a02d2bab0a0eadcc998270d2d06adc277961d236..753c7422643ab606489987684c13e1ee097ae31b 100644
--- a/alfa-client/libs/tech-shared/src/lib/service/formservice.abstract.ts
+++ b/alfa-client/libs/tech-shared/src/lib/service/formservice.abstract.ts
@@ -27,7 +27,7 @@ import { Resource } from '@ngxp/rest';
import { isNil } from 'lodash-es';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
-import { StateResource, hasStateResourceError } from '../resource/resource.util';
+import { StateResource, hasError } from '../resource/resource.util';
import { ApiError, HttpError, InvalidParam, Issue, ProblemDetail } from '../tech.model';
import { isNotUndefined } from '../tech.util';
import {
@@ -56,7 +56,7 @@ export abstract class AbstractFormService {
handleResponse(result: StateResource<Resource | HttpError>): StateResource<Resource | HttpError> {
if (result.loading) return result;
- if (hasStateResourceError(result)) {
+ if (hasError(result)) {
this.handleError(result.error);
}
return result;
diff --git a/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.ts b/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.ts
index d5950ae478d003cf0542750e69d09eb9c35a41ab..78547141a5665a15799b97afc211cee0134f8d49 100644
--- a/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-icon/user-icon.component.ts
@@ -21,20 +21,20 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { Component, Input, SimpleChanges } from '@angular/core';
import {
ApiError,
+ createEmptyStateResource,
+ hasError,
MessageCode,
StateResource,
- createEmptyStateResource,
- hasStateResourceError,
} from '@alfa-client/tech-shared';
import {
- UserProfileResource,
getUserName,
getUserNameInitials,
userProfileMessage,
+ UserProfileResource,
} from '@alfa-client/user-profile-shared';
-import { Component, Input, SimpleChanges } from '@angular/core';
import { isUndefined } from 'lodash-es';
@Component({
@@ -61,7 +61,7 @@ export class UserIconComponent {
if (this.userProfileStateResource.resource) {
return this.getUserTooltip();
}
- if (hasStateResourceError(this.userProfileStateResource)) {
+ if (hasError(this.userProfileStateResource)) {
return this.getErrorTooltip();
}
return userProfileMessage.UNASSIGNED;
diff --git a/alfa-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-in-vorgang.component.ts b/alfa-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-in-vorgang.component.ts
index eb11e7b7c14fc6fbdaf6a365b2a0ec289611f11c..4a93a23e00e7211c40a49c585acd73d78bba2ed7 100644
--- a/alfa-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-in-vorgang.component.ts
+++ b/alfa-client/libs/user-profile/src/lib/user-profile-in-vorgang-container/user-profile-in-vorgang/user-profile-in-vorgang.component.ts
@@ -21,16 +21,16 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
+import { Component, Input } from '@angular/core';
import {
ApiError,
StateResource,
createEmptyStateResource,
- hasStateResourceError,
+ hasError,
isServiceUnavailableMessageCode,
} from '@alfa-client/tech-shared';
import { UserProfileResource } from '@alfa-client/user-profile-shared';
import { VorgangWithEingangLinkRel, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
-import { Component, Input } from '@angular/core';
import { Resource } from '@ngxp/rest';
@Component({
@@ -46,10 +46,7 @@ export class UserProfileInVorgangComponent {
readonly vorgangLinkRel = VorgangWithEingangLinkRel;
public isUserServiceAvailable(stateResource: StateResource<Resource>): boolean {
- if (
- hasStateResourceError(stateResource) &&
- isServiceUnavailableMessageCode(<ApiError>stateResource.error)
- ) {
+ if (hasError(stateResource) && isServiceUnavailableMessageCode(<ApiError>stateResource.error)) {
return false;
}
return true;
diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.spec.ts
index 44d6d7f6274f2c566e17f40e0917703f071d4247..9048ea218b5a838a57884121a7e6be9b35173dcc 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.spec.ts
@@ -1,14 +1,5 @@
-import {
- COMMAND_ERROR_MESSAGES,
- CommandErrorMessage,
- hasCommandError,
- isSuccessfulDone,
-} from '@alfa-client/command-shared';
-import {
- createEmptyStateResource,
- hasContent,
- isClipboardReadSupported,
-} from '@alfa-client/tech-shared';
+import { AktenzeichenEditDialogComponent } from '@alfa-client/vorgang-detail';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
import { mock } from '@alfa-client/test-utils';
import {
OzgcloudPasteTextButtonComponent,
@@ -16,10 +7,8 @@ import {
SnackBarService,
TextEditorComponent,
} from '@alfa-client/ui';
-import { AktenzeichenEditDialogComponent } from '@alfa-client/vorgang-detail';
+import { MockComponent, MockDirective } from 'ng-mocks';
import { VorgangService } from '@alfa-client/vorgang-shared';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { FormBuilder, ReactiveFormsModule, UntypedFormControl } from '@angular/forms';
import {
MAT_DIALOG_DATA,
MatDialogActions,
@@ -27,21 +16,32 @@ import {
MatDialogRef,
} from '@angular/material/dialog';
import { MatIcon } from '@angular/material/icon';
-import { cold, hot } from 'jest-marbles';
import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
-import { MockComponent, MockDirective } from 'ng-mocks';
+import {
+ createEmptyStateResource,
+ hasContent,
+ isClipboardReadSupported,
+} from '@alfa-client/tech-shared';
import { EMPTY, NEVER } from 'rxjs';
+import { FormBuilder, ReactiveFormsModule, UntypedFormControl } from '@angular/forms';
+import { cold, hot } from 'jest-marbles';
import {
createCommandErrorResource,
createCommandResource,
} from '../../../../command-shared/test/command';
-import { AktenzeichenEditDialogFormservice } from './aktenzeichen-edit-dialog.formservice';
+import {
+ COMMAND_ERROR_MESSAGES,
+ CommandErrorMessage,
+ hasError,
+ isSuccessfulDone,
+} from '@alfa-client/command-shared';
import { AktenzeichenEditDialogMessages } from './aktenzeichen-edit-dialog.message';
+import { AktenzeichenEditDialogFormservice } from './aktenzeichen-edit-dialog.formservice';
jest.mock('@alfa-client/tech-shared');
const isClipboardReadSupportedMock = isClipboardReadSupported as jest.Mock;
jest.mock('@alfa-client/command-shared');
-const hasErrorMock = hasCommandError as jest.Mock;
+const hasErrorMock = hasError as jest.Mock;
const isSuccessfulDoneMock = isSuccessfulDone as jest.Mock;
const hasContentMock = hasContent as jest.Mock;
const createEmptyStateResourceMock = createEmptyStateResource as jest.Mock;
diff --git a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts
index 4f43dc05208bfab620a42d7f1b9310a4eb301742..0ce392d5695903ef318c27c704c02b9c18eb8e16 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/aktenzeichen-edit-dialog/aktenzeichen-edit-dialog.component.ts
@@ -1,24 +1,24 @@
import {
COMMAND_ERROR_MESSAGES,
CommandResource,
- hasCommandError,
+ hasError,
isSuccessfulDone,
} from '@alfa-client/command-shared';
import {
- StateResource,
createEmptyStateResource,
hasContent,
isClipboardReadSupported,
+ StateResource,
} from '@alfa-client/tech-shared';
import { SnackBarService } from '@alfa-client/ui';
import { VorgangService, VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { Component, Inject, OnInit } from '@angular/core';
-import { UntypedFormGroup } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { Observable, map, of, startWith, tap } from 'rxjs';
+import { map, Observable, of, startWith, tap } from 'rxjs';
import { AktenzeichenEditDialogData } from './aktenzeichen-edit-dialog.data';
-import { AktenzeichenEditDialogFormservice } from './aktenzeichen-edit-dialog.formservice';
import { AktenzeichenEditDialogMessages } from './aktenzeichen-edit-dialog.message';
+import { UntypedFormGroup } from '@angular/forms';
+import { AktenzeichenEditDialogFormservice } from './aktenzeichen-edit-dialog.formservice';
@Component({
selector: 'alfa-aktenzeichen-edit-dialog',
@@ -73,7 +73,7 @@ export class AktenzeichenEditDialogComponent implements OnInit {
}
onResponse(commandResource: CommandResource) {
- if (commandResource && hasCommandError(commandResource)) {
+ if (commandResource && hasError(commandResource)) {
this.showSnackbar(commandResource);
} else if (isSuccessfulDone(commandResource)) {
this.vorgangService.reloadCurrentVorgang();
@@ -82,7 +82,7 @@ export class AktenzeichenEditDialogComponent implements OnInit {
}
showSnackbar(commandResource: CommandResource): void {
- if (hasCommandError(commandResource)) {
+ if (hasError(commandResource)) {
this.snackBarService.showError(this.getErrorMessage(commandResource));
}
}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.ts
index 084a5361b9ec8460e5cc0f518aeacb535cb47cf9..2fc7831dfd9a89285b24301ca6a8aa19345f083a 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-result/vorgang-detail-bescheiden-result-attachments/vorgang-detail-bescheiden-result-attachments.component.ts
@@ -4,7 +4,7 @@ import {
StateResource,
containsLoading,
getSuccessfullyLoaded,
- hasStateResourceError,
+ hasError,
isLoaded,
isNotNil,
} from '@alfa-client/tech-shared';
@@ -65,7 +65,7 @@ export class VorgangDetailBescheidenResultAttachmentsComponent implements OnDest
buildUploadedAttachments(
uploadStateResource: StateResource<BinaryFileResource>,
): StateResource<BinaryFileResource>[] {
- if (isLoaded(uploadStateResource) || hasStateResourceError(uploadStateResource)) {
+ if (isLoaded(uploadStateResource) || hasError(uploadStateResource)) {
return [...getSuccessfullyLoaded(this.uploadedAttachments), uploadStateResource];
} else if (uploadStateResource.loading && !containsLoading(this.uploadedAttachments)) {
return [...getSuccessfullyLoaded(this.uploadedAttachments), uploadStateResource];
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.ts
index 969f523ee36e8ea48c70b31069747662184148ef..8bb8b9b2cd8c20339979c950da3561851474eb93 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.ts
@@ -1,9 +1,4 @@
-import {
- HttpError,
- StateResource,
- hasStateResourceError,
- isLoaded,
-} from '@alfa-client/tech-shared';
+import { HttpError, StateResource, hasError, isLoaded } from '@alfa-client/tech-shared';
import {
VorgangService,
VorgangWithEingangLinkRel,
@@ -66,6 +61,6 @@ export class VorgangDetailBescheidenStepsContentComponent implements OnInit {
}
noError(stateResource: StateResource<Resource | HttpError>): boolean {
- return isLoaded(stateResource) && !hasStateResourceError(stateResource);
+ return isLoaded(stateResource) && !hasError(stateResource);
}
}
diff --git a/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts b/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts
index c9633abfedc9521786c49655796b3304e4a3972e..a96d7ca4e7cd27b2936a41b5b91e9fcbfc1f853d 100644
--- a/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts
+++ b/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts
@@ -37,7 +37,7 @@ import {
createStateResource,
decodeUrlFromEmbedding,
doIfLoadingRequired,
- hasStateResourceError,
+ hasError,
isNotNull,
isNotUndefined,
replacePlaceholder,
@@ -327,7 +327,7 @@ export class WiedervorlageService implements OnDestroy {
this.submitInProgress$.next(createStateResource(commandStateResource.resource));
this.snackbarService.show(commandStateResource.resource, message);
this.setWiedervorlageListReload();
- } else if (hasStateResourceError(commandStateResource)) {
+ } else if (hasError(commandStateResource)) {
this.submitInProgress$.next(createStateResource(commandStateResource.resource));
}
}