diff --git a/dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.scss b/dmp-frontend/src/notification-service/ui/inapp-notification/listing/mine-inapp-notification-listing.component.scss
similarity index 100%
rename from dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.scss
rename to dmp-frontend/src/notification-service/ui/inapp-notification/listing/mine-inapp-notification-listing.component.scss
diff --git a/dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.ts b/dmp-frontend/src/notification-service/ui/inapp-notification/listing/mine-inapp-notification-listing.component.ts
similarity index 90%
rename from dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.ts
rename to dmp-frontend/src/notification-service/ui/inapp-notification/listing/mine-inapp-notification-listing.component.ts
index 72efce277..f6876d56c 100644
--- a/dmp-frontend/src/app/ui/inapp-notification/listing/mine-inapp-notification-listing.component.ts
+++ b/dmp-frontend/src/notification-service/ui/inapp-notification/listing/mine-inapp-notification-listing.component.ts
@@ -8,21 +8,21 @@ import { DataTableDateTimeFormatPipe } from '@common/formatting/pipes/date-time-
import { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service';
import { ColumnDefinition, ColumnsChangedEvent, HybridListingComponent, PageLoadEvent } from '@common/modules/hybrid-listing/hybrid-listing.component';
import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
-import { InAppNotification } from '@app/core/model/inapp-notification/inapp-notification.model';
-import { InAppNotificationLookup } from '@app/core/query/inapp-notification.lookup';
-import { InAppNotificationService } from '@app/core/services/inapp-notification/inapp-notification.service';
+import { InAppNotificationLookup } from '@notification-service/core/query/inapp-notification.lookup';
+import { InAppNotificationService } from '@notification-service/services/http/inapp-notification.service';
import { IsActive } from '@app/core/common/enum/is-active.enum';
import { nameof } from 'ts-simple-nameof';
import { Observable } from 'rxjs';
import { QueryResult } from '@common/model/query-result';
-import { EnumUtils } from '@app/core/services/utilities/enum-utils.service';
+import { NotificationServiceEnumUtils } from '@notification-service/core/formatting/enum-utils.service';
import { TranslateService } from '@ngx-translate/core';
import { MatDialog } from '@angular/material/dialog';
import { Guid } from '@common/types/guid';
import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
import { takeUntil } from 'rxjs/operators';
-import { NotificationInAppTracking } from '@app/core/common/enum/notification-inapp-tracking.enum';
import { NotificationTypePipe } from '@common/formatting/pipes/notification-type.pipe';
+import { NotificationInAppTracking } from '@notification-service/core/enum/notification-inapp-tracking.enum';
+import { InAppNotification } from '@notification-service/core/model/inapp-notification.model';
@Component({
selector: 'app-mine-inapp-notification-listing',
@@ -59,7 +59,7 @@ export class MineInAppNotificationListingComponent extends BaseListingComponent<
private inAppNotificationService: InAppNotificationService,
public authService: AuthService,
private pipeService: PipeService,
- public enumUtils: EnumUtils,
+ public enumUtils: NotificationServiceEnumUtils,
private language: TranslateService,
private dialog: MatDialog
) {
@@ -74,6 +74,9 @@ export class MineInAppNotificationListingComponent extends BaseListingComponent<
}
protected initializeLookup(): InAppNotificationLookup {
+ console.log('this.enumUtils');
+ console.log(this.enumUtils);
+ console.log(this.inAppNotificationService);
const lookup = new InAppNotificationLookup();
lookup.metadata = { countAll: true };
lookup.page = { offset: 0, size: this.ITEMS_PER_PAGE };
diff --git a/dmp-frontend/src/app/ui/inapp-notification/mine-inapp-notification-routing.module.ts b/dmp-frontend/src/notification-service/ui/inapp-notification/mine-inapp-notification-routing.module.ts
similarity index 100%
rename from dmp-frontend/src/app/ui/inapp-notification/mine-inapp-notification-routing.module.ts
rename to dmp-frontend/src/notification-service/ui/inapp-notification/mine-inapp-notification-routing.module.ts
diff --git a/dmp-frontend/src/app/ui/inapp-notification/mine-inapp-notification.module.ts b/dmp-frontend/src/notification-service/ui/inapp-notification/mine-inapp-notification.module.ts
similarity index 91%
rename from dmp-frontend/src/app/ui/inapp-notification/mine-inapp-notification.module.ts
rename to dmp-frontend/src/notification-service/ui/inapp-notification/mine-inapp-notification.module.ts
index 8dc20bc03..352fa5076 100644
--- a/dmp-frontend/src/app/ui/inapp-notification/mine-inapp-notification.module.ts
+++ b/dmp-frontend/src/notification-service/ui/inapp-notification/mine-inapp-notification.module.ts
@@ -12,6 +12,7 @@ import { MineInAppNotificationListingFiltersComponent } from './listing/filters/
import { MineInAppNotificationListingDialogComponent } from './listing-dialog/mine-inapp-notification-listing-dialog.component';
import { CommonFormattingModule } from '@common/formatting/common-formatting.module';
import { FormattingModule } from '@app/core/formatting.module';
+import { NotificationServiceFormattingModule } from '@notification-service/core/formatting/formatting.module';
@NgModule({
imports: [
@@ -23,7 +24,8 @@ import { FormattingModule } from '@app/core/formatting.module';
MineInAppNotificationRoutingModule,
UserSettingsModule,
CommonFormattingModule,
- FormattingModule
+ // FormattingModule,
+ NotificationServiceFormattingModule
],
declarations: [
MineInAppNotificationListingComponent,
diff --git a/dmp-frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.component.ts b/dmp-frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.component.ts
index 2cd130b19..2e58b8907 100644
--- a/dmp-frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.component.ts
+++ b/dmp-frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.component.ts
@@ -8,17 +8,15 @@ import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/serv
import { BaseComponent } from '@common/base/base.component';
import { FormService } from '@common/forms/form-service';
import { HttpError, HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service';
-// import { TotpService } from '@idp-service/ui/totp/totp.service';
import { TranslateService } from '@ngx-translate/core';
-import { ContactType } from '@notification-service/core/enum/contact-type.enum';
+import { NotificationContactType } from '@notification-service/core/enum/notification-contact-type';
import { NotificationTrackingProcess } from '@notification-service/core/enum/notification-tracking-process.enum';
import { NotificationType } from '@notification-service/core/enum/notification-type.enum';
import { NotificationServiceEnumUtils } from '@notification-service/core/formatting/enum-utils.service';
import { UserNotificationPreference } from '@notification-service/core/model/user-notification-preference.model';
import { NotifierListLookup } from '@notification-service/core/query/notifier-list.lookup';
import { UserNotificationPreferenceService } from '@notification-service/services/http/user-notification-preference.service';
-import { UserProfileNotifierListEditorModel } from '@notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.model';
-import { delay, takeUntil } from 'rxjs/operators';
+import { takeUntil } from 'rxjs/operators';
import { nameof } from 'ts-simple-nameof';
@Component({
@@ -28,12 +26,10 @@ import { nameof } from 'ts-simple-nameof';
})
export class UserProfileNotifierListEditorComponent extends BaseComponent implements OnInit {
- formGroup: FormGroup;
- editorModel: UserProfileNotifierListEditorModel;
- availableNotifiers: { [key: string]: ContactType[] } = {};
+ availableNotifiers: { [key: string]: NotificationContactType[] } = {};
availableNotifiersKeys: NotificationType[];
- notificationTrackingProcess: NotificationTrackingProcess = NotificationTrackingProcess.Pending;
+ notificationTrackingProcess: NotificationTrackingProcess = NotificationTrackingProcess.PENDING;
constructor(
private userNotificationPreferenceService: UserNotificationPreferenceService,
@@ -54,7 +50,6 @@ export class UserProfileNotifierListEditorComponent extends BaseComponent implem
}
getConfiguration() {
- this.formGroup = null;
this.userNotificationPreferenceService.getNotifierList(new NotifierListLookup())
.pipe(takeUntil(this._destroyed))
.subscribe(
@@ -64,7 +59,7 @@ export class UserProfileNotifierListEditorComponent extends BaseComponent implem
this.availableNotifiersKeys = Object.keys(this.availableNotifiers) as NotificationType[];
this.getExistingSelections();
} catch {
- this.notificationTrackingProcess = NotificationTrackingProcess.Error;
+ this.notificationTrackingProcess = NotificationTrackingProcess.ERROR;
this.logger.error('Could not parse Dataset: ' + data);
this.uiNotificationService.snackBarNotification(this.language.instant('COMMONS.ERRORS.DEFAULT'), SnackBarNotificationLevel.Error);
}
@@ -86,9 +81,9 @@ export class UserProfileNotifierListEditorComponent extends BaseComponent implem
if (data.length > 0) {
this.orderAvailableItemsbasedOnExistingSelections(data);
}
- this.notificationTrackingProcess = NotificationTrackingProcess.Completed;
+ this.notificationTrackingProcess = NotificationTrackingProcess.SUCCESSFUL;
} catch {
- this.notificationTrackingProcess = NotificationTrackingProcess.Error;
+ this.notificationTrackingProcess = NotificationTrackingProcess.ERROR;
this.logger.error('Could not parse Dataset: ' + data);
this.uiNotificationService.snackBarNotification(this.language.instant('COMMONS.ERRORS.DEFAULT'), SnackBarNotificationLevel.Error);
}
@@ -128,7 +123,7 @@ export class UserProfileNotifierListEditorComponent extends BaseComponent implem
}
onCallbackError(errorResponse: HttpErrorResponse) {
- this.notificationTrackingProcess = NotificationTrackingProcess.Error;
+ this.notificationTrackingProcess = NotificationTrackingProcess.ERROR;
const error: HttpError = this.httpErrorHandlingService.getError(errorResponse);
if (error.statusCode === 400) {
@@ -137,22 +132,17 @@ export class UserProfileNotifierListEditorComponent extends BaseComponent implem
}
}
- clearErrorModel() {
- this.editorModel.validationErrorModel.clear();
- this.formService.validateAllFormFields(this.formGroup);
- }
-
dropped(event: CdkDragDrop, type: NotificationType) {
moveItemInArray(this.availableNotifiers[type], event.previousIndex, event.currentIndex);
}
preferencesNotPending(): boolean {
- return ! (this.notificationTrackingProcess === NotificationTrackingProcess.Pending);
+ return ! (this.notificationTrackingProcess === NotificationTrackingProcess.PENDING);
}
preferencesNotCompleted(): boolean {
- return ! (this.notificationTrackingProcess === NotificationTrackingProcess.Completed);
+ return ! (this.notificationTrackingProcess === NotificationTrackingProcess.SUCCESSFUL);
}
preferencesNotWithErrors(): boolean {
- return ! (this.notificationTrackingProcess === NotificationTrackingProcess.Error);
+ return ! (this.notificationTrackingProcess === NotificationTrackingProcess.ERROR);
}
}
diff --git a/dmp-frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.model.ts b/dmp-frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.model.ts
deleted file mode 100644
index 5e4a717d9..000000000
--- a/dmp-frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.model.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
-import { BackendErrorValidator } from '@common/forms/validation/custom-validator';
-import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
-import { Validation, ValidationContext } from '@common/forms/validation/validation-context';
-import { Guid } from '@common/types/guid';
-import { ContactType } from '@notification-service/core/enum/contact-type.enum';
-import { NotificationType } from '@notification-service/core/enum/notification-type.enum';
-import { UserNotificationPreferencePersist } from '@notification-service/core/model/user-notification-preference.model';
-
-export class UserProfileNotifierListEditorModel implements UserNotificationPreferencePersist {
- userId?: Guid;
- notificationPreferences: { [key: string]: ContactType[] };
-
- public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
- protected formBuilder: FormBuilder = new FormBuilder();
-
- constructor() { }
-
- public fromModel(userId: Guid, notificationPreferences: { [key: string]: ContactType[] }): UserProfileNotifierListEditorModel {
- this.userId = userId;
- this.notificationPreferences = notificationPreferences;
- return this;
- }
-
- buildForm(context: ValidationContext = null, disabled: boolean = false, availableNotificationTypes: NotificationType[]): FormGroup {
- if (context == null) { context = this.createValidationContext(); }
-
- const notificationPreferencesFormGroup = this.formBuilder.group({});
- availableNotificationTypes.forEach(type => {
- notificationPreferencesFormGroup.addControl(type, new FormControl(this.notificationPreferences ? this.notificationPreferences[type] : undefined));
- });
-
- return this.formBuilder.group({
- userId: [{ value: this.userId, disabled: disabled }, context.getValidation('userId').validators],
- notificationPreferences: notificationPreferencesFormGroup,
- });
- }
-
- createValidationContext(): ValidationContext {
- const baseContext: ValidationContext = new ValidationContext();
- const baseValidationArray: Validation[] = new Array();
-
- baseValidationArray.push({ key: 'userId', validators: [BackendErrorValidator(this.validationErrorModel, 'UserId')] });
-
- baseContext.validation = baseValidationArray;
- return baseContext;
- }
-}
diff --git a/dmp-frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.module.ts b/dmp-frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.module.ts
index 8279617c7..6c09110b9 100644
--- a/dmp-frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.module.ts
+++ b/dmp-frontend/src/notification-service/ui/user-profile/notifier-list/user-profile-notifier-list-editor.module.ts
@@ -11,8 +11,6 @@ import { UserProfileNotifierListEditorComponent } from '@notification-service/ui
CommonUiModule,
CommonFormsModule,
DragDropModule,
- CoreNotificationServiceModule.forRoot(),
- // TotpModule,
],
declarations: [
UserProfileNotifierListEditorComponent