add annotation status page
This commit is contained in:
amentis
parent
637e1cb53f
commit
15d64b4401
|
|
@ -200,6 +200,11 @@ public final class Permission {
|
|||
public static String EditPrefillingSource= "EditPrefillingSource";
|
||||
public static String DeletePrefillingSource = "DeletePrefillingSource";
|
||||
|
||||
//NotificationTemplate
|
||||
public static String BrowseStatus = "BrowseStatus";
|
||||
public static String EditStatus = "EditStatus";
|
||||
public static String DeleteStatus = "DeleteStatus";
|
||||
|
||||
|
||||
// UI Pages
|
||||
public static String ViewDescriptionTemplateTypePage = "ViewDescriptionTemplateTypePage";
|
||||
|
|
@ -224,5 +229,6 @@ public final class Permission {
|
|||
public static String ViewHomePage = "ViewHomePage";
|
||||
public static String ViewMineInAppNotificationPage = "ViewMineInAppNotificationPage";
|
||||
public static String ViewTenantConfigurationPage = "ViewTenantConfigurationPage";
|
||||
public static String ViewStatusPage = "ViewStatusPage";
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1060,6 +1060,29 @@ permissions:
|
|||
clients: [ ]
|
||||
allowAnonymous: false
|
||||
allowAuthenticated: false
|
||||
# Status
|
||||
BrowseStatus:
|
||||
roles:
|
||||
- Admin
|
||||
- TenantAdmin
|
||||
clients: [ ]
|
||||
allowAnonymous: false
|
||||
allowAuthenticated: false
|
||||
EditStatus:
|
||||
roles:
|
||||
- Admin
|
||||
- TenantAdmin
|
||||
clients: [ ]
|
||||
allowAnonymous: false
|
||||
allowAuthenticated: false
|
||||
DeleteStatus:
|
||||
roles:
|
||||
- Admin
|
||||
- TenantAdmin
|
||||
claims: [ ]
|
||||
clients: [ ]
|
||||
allowAnonymous: false
|
||||
allowAuthenticated: false
|
||||
|
||||
# ViewPage Permissions
|
||||
ViewDescriptionTemplateTypePage:
|
||||
|
|
@ -1212,3 +1235,10 @@ permissions:
|
|||
clients: [ ]
|
||||
allowAnonymous: false
|
||||
allowAuthenticated: false
|
||||
ViewStatusPage:
|
||||
roles:
|
||||
- Admin
|
||||
- TenantAdmin
|
||||
clients: [ ]
|
||||
allowAnonymous: false
|
||||
allowAuthenticated: false
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
export enum InternalStatus {
|
||||
Resolved = 0,
|
||||
}
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
export enum IsActive {
|
||||
Inactive = 0,
|
||||
Active = 1
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { BaseEnumUtilsService } from '@common/base/base-enum-utils.service';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { IsActive } from '../enum/is-active.enum';
|
||||
import { InternalStatus } from '../enum/internal-status.enum';
|
||||
|
||||
@Injectable()
|
||||
export class AnnotationServiceEnumUtils extends BaseEnumUtilsService {
|
||||
constructor(private language: TranslateService) { super(); }
|
||||
|
||||
|
||||
toIsActiveString(value: IsActive): string {
|
||||
switch (value) {
|
||||
case IsActive.Active: return this.language.instant('ANNOTATION-SERVICE.TYPES.IS-ACTIVE.ACTIVE');
|
||||
case IsActive.Inactive: return this.language.instant('ANNOTATION-SERVICE.TYPES.IS-ACTIVE.INACTIVE');
|
||||
default: return '';
|
||||
}
|
||||
}
|
||||
|
||||
toInternalStatusString(status: InternalStatus): string {
|
||||
switch (status) {
|
||||
case InternalStatus.Resolved: return this.language.instant('ANNOTATION-SERVICE.TYPES.INTERNAL-STATUS.RESOLVED');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
|
||||
|
||||
//
|
||||
//
|
||||
// This is shared module that provides all notification service formatting utils. Its imported only once.
|
||||
//
|
||||
|
||||
import { CommonFormattingModule } from "@common/formatting/common-formatting.module";
|
||||
import { IsActiveTypePipe } from "./pipes/is-active-type.pipe";
|
||||
import { InternalStatusTypePipe } from "./pipes/internal-status-type.pipe";
|
||||
import { PipeService } from "@common/formatting/pipe.service";
|
||||
import { AnnotationServiceEnumUtils } from "./enum-utils.service";
|
||||
import { NgModule } from "@angular/core";
|
||||
|
||||
//
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonFormattingModule,
|
||||
],
|
||||
declarations: [
|
||||
IsActiveTypePipe,
|
||||
InternalStatusTypePipe
|
||||
],
|
||||
exports: [
|
||||
CommonFormattingModule,
|
||||
IsActiveTypePipe,
|
||||
InternalStatusTypePipe,
|
||||
],
|
||||
providers: [
|
||||
PipeService,
|
||||
IsActiveTypePipe,
|
||||
InternalStatusTypePipe,
|
||||
AnnotationServiceEnumUtils
|
||||
]
|
||||
})
|
||||
export class AnnotationServiceFormattingModule { }
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
import { Pipe, PipeTransform } from '@angular/core';
|
||||
import { AnnotationServiceEnumUtils } from '../enum-utils.service';
|
||||
|
||||
@Pipe({ name: 'InternalStatusTypeFormat' })
|
||||
export class InternalStatusTypePipe implements PipeTransform {
|
||||
constructor(private enumUtils: AnnotationServiceEnumUtils) { }
|
||||
|
||||
public transform(value): any {
|
||||
return this.enumUtils.toInternalStatusString(value);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
import { Pipe, PipeTransform } from '@angular/core';
|
||||
import { AnnotationServiceEnumUtils } from '../enum-utils.service';
|
||||
|
||||
@Pipe({ name: 'IsActiveTypeFormat' })
|
||||
export class IsActiveTypePipe implements PipeTransform {
|
||||
constructor(private enumUtils: AnnotationServiceEnumUtils) { }
|
||||
|
||||
public transform(value): any {
|
||||
return this.enumUtils.toIsActiveString(value);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
import { BaseEntity } from "@common/base/base-entity.model";
|
||||
import { Annotation } from "./annotation.model";
|
||||
import { Status } from "./status.model";
|
||||
import { Guid } from "@common/types/guid";
|
||||
|
||||
export interface AnnotationStatus extends BaseEntity {
|
||||
annotation: Annotation;
|
||||
status: Status;
|
||||
}
|
||||
|
||||
// persist
|
||||
|
||||
export interface AnnotationStatusPersist extends BaseEntity {
|
||||
annotationId: Guid;
|
||||
statusId: Guid;
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@ import { AnnotationProtectionType } from "@app/core/common/enum/annotation-prote
|
|||
import { User } from "@app/core/model/user/user";
|
||||
import { BaseEntity, BaseEntityPersist } from "@common/base/base-entity.model";
|
||||
import { Guid } from "@common/types/guid";
|
||||
import { AnnotationStatus } from "./annotation-status.model";
|
||||
|
||||
export interface Annotation extends BaseEntity {
|
||||
entityId: Guid;
|
||||
|
|
@ -13,6 +14,7 @@ export interface Annotation extends BaseEntity {
|
|||
threadId: Guid;
|
||||
parent: Annotation;
|
||||
protectionType: AnnotationProtectionType;
|
||||
annotationStatuses: AnnotationStatus[];
|
||||
}
|
||||
|
||||
export interface AnnotationPersist extends BaseEntityPersist {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
import { BaseEntity, BaseEntityPersist } from "@common/base/base-entity.model";
|
||||
import { InternalStatus } from "../enum/internal-status.enum";
|
||||
|
||||
export interface Status extends BaseEntity {
|
||||
label: string;
|
||||
internalStatus: InternalStatus;
|
||||
}
|
||||
|
||||
export interface StatusPersist extends BaseEntityPersist {
|
||||
label: string;
|
||||
internalStatus: InternalStatus;
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
import { IsActive } from "@app/core/common/enum/is-active.enum";
|
||||
import { Lookup } from "@common/model/lookup";
|
||||
import { Guid } from "@common/types/guid";
|
||||
import { InternalStatus } from "../enum/internal-status.enum";
|
||||
|
||||
export class StatusLookup extends Lookup implements StatusFilter {
|
||||
|
||||
like: string;
|
||||
ids: Guid[];
|
||||
excludedIds: Guid[];
|
||||
isActive: IsActive[];
|
||||
internalStatuses: InternalStatus[];
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export interface StatusFilter {
|
||||
like: string;
|
||||
ids: Guid[];
|
||||
excludedIds: Guid[];
|
||||
isActive: IsActive[];
|
||||
internalStatuses: InternalStatus[];
|
||||
}
|
||||
|
|
@ -11,6 +11,7 @@ import { FormService } from "@common/forms/form-service";
|
|||
import { HttpErrorHandlingService } from "@common/modules/errors/error-handling/http-error-handling.service";
|
||||
import { FilterService } from "@common/modules/text-filter/filter-service";
|
||||
import { AnnotationService } from "@annotation-service/services/http/annotation.service";
|
||||
import { StatusService } from "./http/status.service";
|
||||
|
||||
@NgModule({})
|
||||
export class CoreAnnotationServiceModule {
|
||||
|
|
@ -30,7 +31,8 @@ export class CoreAnnotationServiceModule {
|
|||
FormService,
|
||||
LoggingService,
|
||||
PrincipalService,
|
||||
AnnotationService
|
||||
AnnotationService,
|
||||
StatusService
|
||||
],
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import { Injectable } from "@angular/core";
|
||||
import { AnnotationStatus, AnnotationStatusPersist } from "@annotation-service/core/model/annotation-status.model";
|
||||
import { Annotation, AnnotationPersist } from "@annotation-service/core/model/annotation.model";
|
||||
import { AnnotationLookup } from "@annotation-service/core/query/annotation.lookup";
|
||||
import { ConfigurationService } from "@app/core/services/configuration/configuration.service";
|
||||
|
|
@ -42,6 +43,14 @@ export class AnnotationService {
|
|||
catchError((error: any) => throwError(error)));
|
||||
}
|
||||
|
||||
persistStatus(item: AnnotationStatusPersist) {
|
||||
const url = `${this.apiBase}/persist-status`;
|
||||
|
||||
return this.http
|
||||
.post<AnnotationStatus>(url, item).pipe(
|
||||
catchError((error: any) => throwError(error)));
|
||||
}
|
||||
|
||||
delete(id: Guid, ): Observable<void> {
|
||||
const url = `${this.apiBase}/${id}`;
|
||||
return this.http
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
import { Injectable } from "@angular/core";
|
||||
import { Status, StatusPersist } from "@annotation-service/core/model/status.model";
|
||||
import { StatusLookup } from "@annotation-service/core/query/status.lookup";
|
||||
import { ConfigurationService } from "@app/core/services/configuration/configuration.service";
|
||||
import { BaseHttpV2Service } from "@app/core/services/http/base-http-v2.service";
|
||||
import { QueryResult } from "@common/model/query-result";
|
||||
import { FilterService } from "@common/modules/text-filter/filter-service";
|
||||
import { Guid } from "@common/types/guid";
|
||||
import { Observable, throwError } from "rxjs";
|
||||
import { catchError } from "rxjs/operators";
|
||||
|
||||
@Injectable()
|
||||
export class StatusService {
|
||||
private get apiBase(): string { return `${this.installationConfiguration.annotationServiceAddress}api/status`; }
|
||||
|
||||
constructor(
|
||||
private installationConfiguration: ConfigurationService,
|
||||
private http: BaseHttpV2Service,
|
||||
private filterService: FilterService
|
||||
) { }
|
||||
|
||||
query(q: StatusLookup): Observable<QueryResult<Status>> {
|
||||
const url = `${this.apiBase}/query`;
|
||||
|
||||
return this.http
|
||||
.post<QueryResult<Status>>(url, q).pipe(
|
||||
catchError((error: any) => throwError(error)));
|
||||
}
|
||||
|
||||
getSingle(id: Guid, reqFields: string[] = []): Observable<Status> {
|
||||
const url = `${this.apiBase}/${id}`;
|
||||
const options = { params: { f: reqFields } };
|
||||
|
||||
return this.http
|
||||
.get<Status>(url, options).pipe(
|
||||
catchError((error: any) => throwError(error)));
|
||||
}
|
||||
|
||||
persist(item: StatusPersist) {
|
||||
const url = `${this.apiBase}/persist`;
|
||||
|
||||
return this.http
|
||||
.post<Status>(url, item).pipe(
|
||||
catchError((error: any) => throwError(error)));
|
||||
}
|
||||
|
||||
delete(id: Guid, ): Observable<void> {
|
||||
const url = `${this.apiBase}/${id}`;
|
||||
return this.http
|
||||
.delete<void>(url).pipe(
|
||||
catchError((error: any) => throwError(error)));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
<div class="container-fluid">
|
||||
<div class="row status-editor">
|
||||
<div class="col-md-10 offset-md-1 colums-gapped">
|
||||
|
||||
<div class="row justify-content-between align-items-center mb-4 mt-4">
|
||||
<div class="col">
|
||||
<app-navigation-breadcrumb />
|
||||
</div>
|
||||
|
||||
<div class="col-auto">
|
||||
<button mat-button class="action-btn" (click)="cancel()" type="button">{{'ANNOTATION-SERVICE.STATUS-EDITOR.ACTIONS.CANCEL' | translate}}</button>
|
||||
</div>
|
||||
<div class="col-auto" *ngIf="canDelete">
|
||||
<button mat-button (click)="delete()" class="action-btn" type="button">
|
||||
<mat-icon>delete</mat-icon>
|
||||
{{'ANNOTATION-SERVICE.STATUS-EDITOR.ACTIONS.DELETE' | translate}}
|
||||
</button>
|
||||
</div>
|
||||
<div class="col-auto" *ngIf="canSave">
|
||||
<button mat-button class="action-btn" (click)="save(); formSubmit()">
|
||||
<mat-icon>save</mat-icon>
|
||||
{{'ANNOTATION-SERVICE.STATUS-EDITOR.ACTIONS.SAVE' | translate}}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<mat-card appearance="outlined">
|
||||
<mat-card-content>
|
||||
<form (ngSubmit)="formSubmit()" [formGroup]="formGroup" *ngIf="formGroup">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-12 pt-1 pb-1">
|
||||
<span>
|
||||
{{'ANNOTATION-SERVICE.STATUS-EDITOR.FIELDS.LABEL' | translate}}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 mt-1">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<mat-form-field class="w-100">
|
||||
<input matInput placeholder="{{'ANNOTATION-SERVICE.STATUS-EDITOR.FIELDS.LABEL' | translate}}" [formControl]="formGroup.get('label')" required>
|
||||
<mat-error *ngIf="formGroup.get('label').hasError('backendError')">{{formGroup.get('label').getError('backendError').message}}</mat-error>
|
||||
<mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<mat-form-field class="w-100">
|
||||
<mat-label>{{'ANNOTATION-SERVICE.STATUS-EDITOR.FIELDS.INTERNAL-STATUS' | translate}}</mat-label>
|
||||
<mat-select [formControl]="formGroup.get('internalStatus')">
|
||||
<mat-option *ngFor="let internalStatus of internalStatusEnum" [value]="internalStatus">{{enumUtils.toInternalStatusString(internalStatus)}}</mat-option>
|
||||
</mat-select>
|
||||
<mat-error *ngIf="formGroup.get('internalStatus').hasError('backendError')">{{formGroup.get('internalStatus').getError('backendError').message}}</mat-error>
|
||||
<mat-error *ngIf="formGroup.get('internalStatus').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</mat-card-content>
|
||||
</mat-card>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
.status-editor {
|
||||
// padding-top: 1em;
|
||||
|
||||
.editor-actions {
|
||||
margin-top: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
.action-btn {
|
||||
border-radius: 30px;
|
||||
background-color: var(--secondary-color);
|
||||
border: 1px solid transparent;
|
||||
padding-left: 2em;
|
||||
padding-right: 2em;
|
||||
box-shadow: 0px 3px 6px #1E202029;
|
||||
|
||||
transition-property: background-color, color;
|
||||
transition-duration: 200ms;
|
||||
transition-delay: 50ms;
|
||||
transition-timing-function: ease-in-out;
|
||||
&:disabled{
|
||||
background-color: #CBCBCB;
|
||||
color: #FFF;
|
||||
border: 0px;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,177 @@
|
|||
import { Component, OnInit } from '@angular/core';
|
||||
import { UntypedFormGroup } from '@angular/forms';
|
||||
import { MatDialog } from '@angular/material/dialog';
|
||||
import { Title } from '@angular/platform-browser';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { IsActive } from '@app/core/common/enum/is-active.enum';
|
||||
import { AppPermission } from '@app/core/common/enum/permission.enum';
|
||||
import { AuthService } from '@app/core/services/auth/auth.service';
|
||||
import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
|
||||
import { LockService } from '@app/core/services/lock/lock.service';
|
||||
import { LoggingService } from '@app/core/services/logging/logging-service';
|
||||
import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
|
||||
import { QueryParamsService } from '@app/core/services/utilities/query-params.service';
|
||||
import { BaseEditor } from '@common/base/base-editor';
|
||||
import { FormService } from '@common/forms/form-service';
|
||||
import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
|
||||
import { HttpErrorHandlingService } from '@common/modules/errors/error-handling/http-error-handling.service';
|
||||
import { FilterService } from '@common/modules/text-filter/filter-service';
|
||||
import { Guid } from '@common/types/guid';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { map, takeUntil } from 'rxjs/operators';
|
||||
import { StatusEditorModel } from './status-editor.model';
|
||||
import { StatusEditorService } from './status-editor.service';
|
||||
import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
|
||||
import { AnnotationServiceEnumUtils } from '@annotation-service/core/formatting/enum-utils.service';
|
||||
import { Status, StatusPersist } from '@annotation-service/core/model/status.model';
|
||||
import { StatusService } from '@annotation-service/services/http/status.service';
|
||||
import { StatusEditorResolver } from './status-editor.resolver';
|
||||
import { InternalStatus } from '@annotation-service/core/enum/internal-status.enum';
|
||||
|
||||
@Component({
|
||||
templateUrl: './status-editor.component.html',
|
||||
styleUrls: ['./status-editor.component.scss'],
|
||||
providers: [StatusEditorService]
|
||||
})
|
||||
export class StatusEditorComponent extends BaseEditor<StatusEditorModel, Status> implements OnInit {
|
||||
|
||||
isNew = true;
|
||||
isDeleted = false;
|
||||
formGroup: UntypedFormGroup = null;
|
||||
showInactiveDetails = false;
|
||||
public internalStatusEnum = this.enumUtils.getEnumValues<InternalStatus>(InternalStatus);
|
||||
|
||||
|
||||
protected get canDelete(): boolean {
|
||||
return !this.isDeleted && !this.isNew && this.hasPermission(this.authService.permissionEnum.DeleteStatus) && this.editorModel.belongsToCurrentTenant != false;
|
||||
}
|
||||
|
||||
protected get canSave(): boolean {
|
||||
return !this.isDeleted && this.hasPermission(this.authService.permissionEnum.EditStatus) && this.editorModel.belongsToCurrentTenant != false;
|
||||
}
|
||||
|
||||
private hasPermission(permission: AppPermission): boolean {
|
||||
return this.authService.hasPermission(permission) || this.editorModel?.permissions?.includes(permission);
|
||||
}
|
||||
|
||||
constructor(
|
||||
// BaseFormEditor injected dependencies
|
||||
protected dialog: MatDialog,
|
||||
protected language: TranslateService,
|
||||
protected formService: FormService,
|
||||
protected router: Router,
|
||||
protected uiNotificationService: UiNotificationService,
|
||||
protected httpErrorHandlingService: HttpErrorHandlingService,
|
||||
protected filterService: FilterService,
|
||||
protected route: ActivatedRoute,
|
||||
protected queryParamsService: QueryParamsService,
|
||||
protected lockService: LockService,
|
||||
protected authService: AuthService,
|
||||
protected configurationService: ConfigurationService,
|
||||
// Rest dependencies. Inject any other needed deps here:
|
||||
public enumUtils: AnnotationServiceEnumUtils,
|
||||
private statusService: StatusService,
|
||||
private logger: LoggingService,
|
||||
private statusEditorService: StatusEditorService,
|
||||
public titleService: Title,
|
||||
protected routerUtils: RouterUtilsService
|
||||
) {
|
||||
const statusLabel: string = route.snapshot.data['entity']?.name;
|
||||
if (statusLabel) {
|
||||
titleService.setTitle(statusLabel);
|
||||
} else {
|
||||
titleService.setTitle('ANNOTATION-SERVICE.STATUS-EDITOR.TITLE-EDIT-ANNOTATION-STATUS');
|
||||
}
|
||||
super(dialog, language, formService, router, uiNotificationService, httpErrorHandlingService, filterService, route, queryParamsService, lockService, authService, configurationService);
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
super.ngOnInit();
|
||||
}
|
||||
|
||||
getItem(itemId: Guid, successFunction: (item: Status) => void) {
|
||||
this.statusService.getSingle(itemId, StatusEditorResolver.lookupFields())
|
||||
.pipe(map(data => data as Status), takeUntil(this._destroyed))
|
||||
.subscribe(
|
||||
data => successFunction(data),
|
||||
error => this.onCallbackError(error)
|
||||
);
|
||||
}
|
||||
|
||||
prepareForm(data: Status) {
|
||||
try {
|
||||
this.editorModel = data ? new StatusEditorModel().fromModel(data) : new StatusEditorModel();
|
||||
this.isDeleted = data ? data.isActive === IsActive.Inactive : false;
|
||||
this.buildForm();
|
||||
} catch (error) {
|
||||
this.logger.error('Could not parse Status item: ' + data + error);
|
||||
this.uiNotificationService.snackBarNotification(this.language.instant('COMMONS.ERRORS.DEFAULT'), SnackBarNotificationLevel.Error);
|
||||
}
|
||||
}
|
||||
|
||||
buildForm() {
|
||||
this.formGroup = this.editorModel.buildForm(null, this.isDeleted || !this.authService.hasPermission(AppPermission.EditStatus));
|
||||
this.statusEditorService.setValidationErrorModel(this.editorModel.validationErrorModel);
|
||||
}
|
||||
|
||||
refreshData(): void {
|
||||
this.getItem(this.editorModel.id, (data: Status) => this.prepareForm(data));
|
||||
}
|
||||
|
||||
refreshOnNavigateToData(id?: Guid): void {
|
||||
this.formGroup.markAsPristine();
|
||||
|
||||
this.router.navigate([this.routerUtils.generateUrl('/annotation-statuses')], { queryParams: { 'lookup': this.queryParamsService.serializeLookup(this.lookupParams), 'lv': ++this.lv }, replaceUrl: true, relativeTo: this.route });
|
||||
}
|
||||
|
||||
persistEntity(onSuccess?: (response) => void): void {
|
||||
const formData = this.formService.getValue(this.formGroup.value) as StatusPersist;
|
||||
|
||||
this.statusService.persist(formData)
|
||||
.pipe(takeUntil(this._destroyed)).subscribe(
|
||||
// for each state navigate to listing page
|
||||
complete => {
|
||||
this.onCallbackSuccess();
|
||||
},
|
||||
error => this.onCallbackError(error)
|
||||
);
|
||||
}
|
||||
|
||||
formSubmit(): void {
|
||||
this.formService.removeAllBackEndErrors(this.formGroup);
|
||||
this.formService.touchAllFormFields(this.formGroup);
|
||||
if (!this.isFormValid()) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.persistEntity();
|
||||
}
|
||||
|
||||
public delete() {
|
||||
const value = this.formGroup.value;
|
||||
if (value.id) {
|
||||
const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
|
||||
maxWidth: '300px',
|
||||
data: {
|
||||
message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'),
|
||||
confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'),
|
||||
cancelButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CANCEL')
|
||||
}
|
||||
});
|
||||
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
|
||||
if (result) {
|
||||
this.statusService.delete(value.id).pipe(takeUntil(this._destroyed))
|
||||
.subscribe(
|
||||
complete => this.onCallbackDeleteSuccess(),
|
||||
error => this.onCallbackError(error)
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
clearErrorModel() {
|
||||
this.editorModel.validationErrorModel.clear();
|
||||
this.formService.validateAllFormFields(this.formGroup);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
|
||||
import { InternalStatus } from '@annotation-service/core/enum/internal-status.enum';
|
||||
import { Status, StatusPersist } from '@annotation-service/core/model/status.model';
|
||||
import { BaseEditorModel } from '@common/base/base-form-editor-model';
|
||||
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';
|
||||
|
||||
export class StatusEditorModel extends BaseEditorModel implements StatusPersist {
|
||||
label: string;
|
||||
internalStatus: InternalStatus;
|
||||
permissions: string[];
|
||||
|
||||
public validationErrorModel: ValidationErrorModel = new ValidationErrorModel();
|
||||
protected formBuilder: UntypedFormBuilder = new UntypedFormBuilder();
|
||||
|
||||
constructor() { super(); }
|
||||
|
||||
public fromModel(item: Status): StatusEditorModel {
|
||||
if (item) {
|
||||
super.fromModel(item);
|
||||
this.label = item.label;
|
||||
this.internalStatus = item.internalStatus;
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
buildForm(context: ValidationContext = null, disabled: boolean = false): UntypedFormGroup {
|
||||
if (context == null) { context = this.createValidationContext(); }
|
||||
|
||||
return this.formBuilder.group({
|
||||
id: [{ value: this.id, disabled: disabled }, context.getValidation('id').validators],
|
||||
label: [{ value: this.label, disabled: disabled }, context.getValidation('label').validators],
|
||||
internalStatus: [{ value: this.internalStatus, disabled: disabled }, context.getValidation('internalStatus').validators],
|
||||
hash: [{ value: this.hash, disabled: disabled }, context.getValidation('hash').validators]
|
||||
});
|
||||
}
|
||||
|
||||
createValidationContext(): ValidationContext {
|
||||
const baseContext: ValidationContext = new ValidationContext();
|
||||
const baseValidationArray: Validation[] = new Array<Validation>();
|
||||
baseValidationArray.push({ key: 'id', validators: [BackendErrorValidator(this.validationErrorModel, 'id')] });
|
||||
baseValidationArray.push({ key: 'label', validators: [Validators.required, BackendErrorValidator(this.validationErrorModel, 'label')] });
|
||||
baseValidationArray.push({ key: 'internalStatus', validators: [BackendErrorValidator(this.validationErrorModel, 'internalStatus')] });
|
||||
baseValidationArray.push({ key: 'hash', validators: [] });
|
||||
|
||||
baseContext.validation = baseValidationArray;
|
||||
return baseContext;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
|
||||
import { Status } from '@annotation-service/core/model/status.model';
|
||||
import { StatusService } from '@annotation-service/services/http/status.service';
|
||||
import { BreadcrumbService } from '@app/ui/misc/breadcrumb/breadcrumb.service';
|
||||
import { BaseEditorResolver } from '@common/base/base-editor.resolver';
|
||||
import { Guid } from '@common/types/guid';
|
||||
import { takeUntil, tap } from 'rxjs/operators';
|
||||
import { nameof } from 'ts-simple-nameof';
|
||||
|
||||
@Injectable()
|
||||
export class StatusEditorResolver extends BaseEditorResolver {
|
||||
|
||||
constructor(private statusService: StatusService, private breadcrumbService: BreadcrumbService) {
|
||||
super();
|
||||
}
|
||||
|
||||
public static lookupFields(): string[] {
|
||||
return [
|
||||
...BaseEditorResolver.lookupFields(),
|
||||
nameof<Status>(x => x.id),
|
||||
nameof<Status>(x => x.label),
|
||||
nameof<Status>(x => x.internalStatus),
|
||||
nameof<Status>(x => x.createdAt),
|
||||
nameof<Status>(x => x.updatedAt),
|
||||
nameof<Status>(x => x.hash),
|
||||
nameof<Status>(x => x.isActive)
|
||||
]
|
||||
}
|
||||
|
||||
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
|
||||
|
||||
const fields = [
|
||||
...StatusEditorResolver.lookupFields()
|
||||
];
|
||||
const id = route.paramMap.get('id');
|
||||
|
||||
if (id != null) {
|
||||
return this.statusService.getSingle(Guid.parse(id), fields).pipe(tap(x => this.breadcrumbService.addIdResolvedValue(x.id?.toString(), x.label)), takeUntil(this._destroyed));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
import { Injectable } from "@angular/core";
|
||||
import { ValidationErrorModel } from "@common/forms/validation/error-model/validation-error-model";
|
||||
|
||||
@Injectable()
|
||||
export class StatusEditorService {
|
||||
private validationErrorModel: ValidationErrorModel;
|
||||
|
||||
public setValidationErrorModel(validationErrorModel: ValidationErrorModel): void {
|
||||
this.validationErrorModel = validationErrorModel;
|
||||
}
|
||||
|
||||
public getValidationErrorModel(): ValidationErrorModel {
|
||||
return this.validationErrorModel;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
<div class="d-flex align-items-center gap-1-rem">
|
||||
|
||||
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
|
||||
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
|
||||
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
|
||||
</button>
|
||||
|
||||
|
||||
<mat-menu #filterMenu>
|
||||
<div class="container-fluid" (click)="$event?.stopPropagation?.()">
|
||||
<div class="row justify-content-between">
|
||||
<div class="col-auto mt-2">
|
||||
<h4>{{'ANNOTATION-SERVICE.STATUS-LISTING.FILTER.TITLE' | translate}}</h4>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<button color="accent" mat-button (click)="clearFilters()">
|
||||
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row mt-3">
|
||||
<div class="col-12">
|
||||
<section class="w-100">
|
||||
<mat-slide-toggle labelPosition="before" [(ngModel)]="internalFilters.isActive">
|
||||
{{'ANNOTATION-SERVICE.STATUS-LISTING.FILTER.IS-ACTIVE' | translate}}
|
||||
</mat-slide-toggle>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row mt-3">
|
||||
<div class="col-12">
|
||||
<mat-form-field class="w-100">
|
||||
<mat-label>{{'ANNOTATION-SERVICE.STATUS-LISTING.FILTER.INTERNAL-STATUS' | translate}}</mat-label>
|
||||
<mat-select multiple [(ngModel)]="internalFilters.internalStatuses">
|
||||
<mat-option *ngFor="let type of internalStatusEnumValues" [value]="type">{{enumUtils.toInternalStatusString(type)}}</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
|
||||
<div class="col-auto">
|
||||
<button class="normal-btn-light-sm" (click)="filterMenuTrigger?.closeMenu()">
|
||||
{{'ANNOTATION-SERVICE.STATUS-LISTING.FILTER.CANCEL' | translate}}
|
||||
</button>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<button class="normal-btn-sm" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
|
||||
{{'ANNOTATION-SERVICE.STATUS-LISTING.FILTER.APPLY-FILTERS' | translate}}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</mat-menu>
|
||||
|
||||
<!-- <app-expandable-search-field [(value)]=internalFilters.like (valueChange)="onSearchTermChange($event)" /> -->
|
||||
</div>
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
|
||||
::ng-deep.mat-mdc-menu-panel {
|
||||
max-width: 100% !important;
|
||||
height: 100% !important;
|
||||
}
|
||||
|
||||
:host::ng-deep.mat-mdc-menu-content:not(:empty) {
|
||||
padding-top: 0 !important;
|
||||
}
|
||||
|
||||
|
||||
.filter-button{
|
||||
padding-top: .6rem;
|
||||
padding-bottom: .6rem;
|
||||
// .mat-icon{
|
||||
// font-size: 1.5em;
|
||||
// width: 1.2em;
|
||||
// height: 1.2em;
|
||||
// }
|
||||
}
|
||||
|
||||
::ng-deep .mdc-form-field {
|
||||
label {
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,100 @@
|
|||
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
|
||||
import { BaseComponent } from '@common/base/base.component';
|
||||
import { IsActive } from '@notification-service/core/enum/is-active.enum';
|
||||
import { nameof } from 'ts-simple-nameof';
|
||||
import { StatusFilter } from '@annotation-service/core/query/status.lookup';
|
||||
import { InternalStatus } from '@annotation-service/core/enum/internal-status.enum';
|
||||
import { AnnotationServiceEnumUtils } from '@annotation-service/core/formatting/enum-utils.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-status-listing-filters',
|
||||
templateUrl: './status-listing-filters.component.html',
|
||||
styleUrls: ['./status-listing-filters.component.scss']
|
||||
})
|
||||
export class StatusListingFiltersComponent extends BaseComponent implements OnInit, OnChanges {
|
||||
|
||||
@Input() readonly filter: StatusFilter;
|
||||
@Output() filterChange = new EventEmitter<StatusFilter>();
|
||||
internalStatusEnumValues = this.enumUtils.getEnumValues<InternalStatus>(InternalStatus)
|
||||
|
||||
// * State
|
||||
internalFilters: StatusListingFilters = this._getEmptyFilters();
|
||||
|
||||
protected appliedFilterCount: number = 0;
|
||||
constructor(
|
||||
public enumUtils: AnnotationServiceEnumUtils,
|
||||
) { super(); }
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
|
||||
ngOnChanges(changes: SimpleChanges): void {
|
||||
const filterChange = changes[nameof<StatusListingFiltersComponent>(x => x.filter)]?.currentValue as StatusFilter;
|
||||
if (filterChange) {
|
||||
this.updateFilters()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
onSearchTermChange(searchTerm: string): void {
|
||||
this.applyFilters()
|
||||
}
|
||||
|
||||
|
||||
protected updateFilters(): void {
|
||||
this.internalFilters = this._parseToInternalFilters(this.filter);
|
||||
this.appliedFilterCount = this._computeAppliedFilters(this.internalFilters);
|
||||
}
|
||||
|
||||
protected applyFilters(): void {
|
||||
const { isActive, internalStatuses, like } = this.internalFilters ?? {}
|
||||
this.filterChange.emit({
|
||||
...this.filter,
|
||||
like: like,
|
||||
isActive: isActive ? [IsActive.Active] : [IsActive.Inactive],
|
||||
internalStatuses
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
private _parseToInternalFilters(inputFilter: StatusFilter): StatusListingFilters {
|
||||
if (!inputFilter) {
|
||||
return this._getEmptyFilters();
|
||||
}
|
||||
|
||||
let { isActive, internalStatuses, like } = inputFilter;
|
||||
|
||||
return {
|
||||
isActive: (isActive ?? [])?.includes(IsActive.Active) || !isActive?.length,
|
||||
internalStatuses: internalStatuses,
|
||||
like: like
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private _getEmptyFilters(): StatusListingFilters {
|
||||
return {
|
||||
isActive: true,
|
||||
internalStatuses: null,
|
||||
like: null,
|
||||
}
|
||||
}
|
||||
|
||||
private _computeAppliedFilters(filters: StatusListingFilters): number {
|
||||
let count = 0;
|
||||
if (filters?.isActive) {
|
||||
count++
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
clearFilters() {
|
||||
this.internalFilters = this._getEmptyFilters();
|
||||
}
|
||||
}
|
||||
|
||||
interface StatusListingFilters {
|
||||
like: string;
|
||||
isActive: boolean;
|
||||
internalStatuses: InternalStatus[];
|
||||
}
|
||||
|
|
@ -0,0 +1,93 @@
|
|||
<div class="container-fluid">
|
||||
<div class="row status-listing">
|
||||
<div class="col-md-10 offset-md-1">
|
||||
|
||||
<div class="row mb-4 mt-4">
|
||||
<div class="col">
|
||||
<app-navigation-breadcrumb />
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<button mat-raised-button class="create-btn"
|
||||
*ngIf="authService.hasPermission(authService.permissionEnum.EditStatus)"
|
||||
[routerLink]="routerUtils.generateUrl(['/annotation-statuses/new'])">
|
||||
<mat-icon>add</mat-icon>
|
||||
{{'ANNOTATION-SERVICE.STATUS-LISTING.CREATE' | translate}}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<app-hybrid-listing [rows]="gridRows" [columns]="gridColumns" [visibleColumns]="visibleColumns"
|
||||
[count]="totalElements" [offset]="currentPageNumber" [limit]="lookup.page.size"
|
||||
[defaultSort]="lookup.order?.items" [externalSorting]="true" (rowActivated)="onRowActivated($event)"
|
||||
(pageLoad)="alterPage($event)" (columnSort)="onColumnSort($event)"
|
||||
(columnsChanged)="onColumnsChanged($event)" [listItemTemplate]="listItemTemplate">
|
||||
|
||||
<app-status-listing-filters hybrid-listing-filters [(filter)]="lookup"
|
||||
(filterChange)="filterChanged($event)" />
|
||||
|
||||
<app-user-settings-picker [key]="userSettingsKey" [userPreference]="lookup"
|
||||
(onSettingSelected)="changeSetting($event)" [autoSelectUserSettings]="autoSelectUserSettings"
|
||||
user-preference-settings />
|
||||
</app-hybrid-listing>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ng-template #listItemTemplate let-item="item" let-isColumnSelected="isColumnSelected">
|
||||
|
||||
|
||||
<div class="d-flex align-items-center p-3 gap-1-rem">
|
||||
<div class="row">
|
||||
<ng-container *ngIf="isColumnSelected('label')">
|
||||
<a class="buttonLinkClass" [routerLink]="routerUtils.generateUrl('./' + item?.id)" class="col-12"
|
||||
(click)="$event.stopPropagation()">{{item?.name | nullifyValue}}</a>
|
||||
<br />
|
||||
</ng-container>
|
||||
<ng-container *ngIf="isColumnSelected('internalStatus')">
|
||||
<span class="col-12">
|
||||
{{'ANNOTATION-SERVICE.STATUS-LISTING.FIELDS.INTERNAL-STATUS' | translate}}:
|
||||
<small>
|
||||
{{enumUtils.toNotificationTypeString(item.notificationType) | nullifyValue}}
|
||||
</small>
|
||||
</span>
|
||||
<br>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="isColumnSelected('createdAt')">
|
||||
<span class="col-12">
|
||||
{{'ANNOTATION-SERVICE.STATUS-LISTING.FIELDS.CREATED-AT' | translate}}:
|
||||
<small>
|
||||
{{item?.createdAt | dateTimeFormatter : 'short' | nullifyValue}}
|
||||
</small>
|
||||
</span>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="isColumnSelected('updatedAt')">
|
||||
<span class="col-12">
|
||||
{{'ANNOTATION-SERVICE.STATUS-LISTING.FIELDS.UPDATED-AT' | translate}}:
|
||||
<small>
|
||||
{{item?.updatedAt | dateTimeFormatter : 'short' | nullifyValue}}
|
||||
</small>
|
||||
</span>
|
||||
</ng-container>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<ng-template #actions let-row="row" let-item>
|
||||
<div class="row" (click)="$event.stopPropagation()">
|
||||
<div class="col-auto">
|
||||
<button mat-icon-button [matMenuTriggerFor]="actionsMenu">
|
||||
<mat-icon>more_horiz</mat-icon>
|
||||
</button>
|
||||
<mat-menu #actionsMenu="matMenu">
|
||||
<button mat-menu-item [routerLink]="routerUtils.generateUrl(['/notification-templates/', row.id])">
|
||||
<mat-icon>edit</mat-icon>{{'ANNOTATION-SERVICE.STATUS-LISTING.ACTIONS.EDIT' | translate}}
|
||||
</button>
|
||||
<button mat-menu-item (click)="deleteType(row.id)">
|
||||
<mat-icon>delete</mat-icon>
|
||||
{{'ANNOTATION-SERVICE.STATUS-LISTING.ACTIONS.DELETE' | translate}}
|
||||
</button>
|
||||
</mat-menu>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
.status-listing {
|
||||
// margin-top: 1.3rem;
|
||||
// margin-left: 1rem;
|
||||
// margin-right: 2rem;
|
||||
|
||||
.mat-header-row{
|
||||
background: #f3f5f8;
|
||||
}
|
||||
.mat-card {
|
||||
margin: 16px 0;
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
.mat-row {
|
||||
cursor: pointer;
|
||||
min-height: 4.5em;
|
||||
}
|
||||
|
||||
mat-row:hover {
|
||||
background-color: #eef5f6;
|
||||
}
|
||||
.mat-fab-bottom-right {
|
||||
float: right;
|
||||
z-index: 5;
|
||||
}
|
||||
}
|
||||
.create-btn {
|
||||
border-radius: 30px;
|
||||
background-color: var(--secondary-color);
|
||||
padding-left: 2em;
|
||||
padding-right: 2em;
|
||||
// color: #000;
|
||||
|
||||
.button-text{
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
.dlt-btn {
|
||||
color: rgba(0, 0, 0, 0.54);
|
||||
}
|
||||
|
||||
.status-chip{
|
||||
|
||||
border-radius: 20px;
|
||||
padding-left: 1em;
|
||||
padding-right: 1em;
|
||||
padding-top: 0.2em;
|
||||
font-size: .8em;
|
||||
}
|
||||
|
||||
.status-chip-finalized{
|
||||
color: #568b5a;
|
||||
background: #9dd1a1 0% 0% no-repeat padding-box;
|
||||
}
|
||||
|
||||
.status-chip-draft{
|
||||
color: #00c4ff;
|
||||
background: #d3f5ff 0% 0% no-repeat padding-box;
|
||||
}
|
||||
|
|
@ -0,0 +1,180 @@
|
|||
import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
|
||||
import { MatDialog } from '@angular/material/dialog';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { AuthService } from '@app/core/services/auth/auth.service';
|
||||
import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
|
||||
import { QueryParamsService } from '@app/core/services/utilities/query-params.service';
|
||||
import { BaseListingComponent } from '@common/base/base-listing-component';
|
||||
import { PipeService } from '@common/formatting/pipe.service';
|
||||
import { DataTableDateTimeFormatPipe } from '@app/core/pipes/date-time-format.pipe';
|
||||
import { QueryResult } from '@common/model/query-result';
|
||||
import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog/confirmation-dialog.component';
|
||||
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 { Guid } from '@common/types/guid';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { Observable } from 'rxjs';
|
||||
import { takeUntil } from 'rxjs/operators';
|
||||
import { nameof } from 'ts-simple-nameof';
|
||||
import { IsActive } from '@notification-service/core/enum/is-active.enum';
|
||||
import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
|
||||
import { Status } from '@annotation-service/core/model/status.model';
|
||||
import { StatusLookup } from '@annotation-service/core/query/status.lookup';
|
||||
import { StatusService } from '@annotation-service/services/http/status.service';
|
||||
import { AnnotationServiceEnumUtils } from '@annotation-service/core/formatting/enum-utils.service';
|
||||
import { InternalStatusTypePipe } from '@annotation-service/core/formatting/pipes/internal-status-type.pipe';
|
||||
import { IsActiveTypePipe } from '@annotation-service/core/formatting/pipes/is-active-type.pipe';
|
||||
|
||||
@Component({
|
||||
templateUrl: './status-listing.component.html',
|
||||
styleUrls: ['./status-listing.component.scss']
|
||||
})
|
||||
export class StatusListingComponent extends BaseListingComponent<Status, StatusLookup> implements OnInit {
|
||||
publish = false;
|
||||
userSettingsKey = { key: 'StatusListingUserSettings' };
|
||||
propertiesAvailableForOrder: ColumnDefinition[];
|
||||
|
||||
@ViewChild('actions', { static: true }) actions?: TemplateRef<any>;
|
||||
@ViewChild(HybridListingComponent, { static: true }) hybridListingComponent: HybridListingComponent;
|
||||
|
||||
private readonly lookupFields: string[] = [
|
||||
nameof<Status>(x => x.id),
|
||||
nameof<Status>(x => x.label),
|
||||
nameof<Status>(x => x.internalStatus),
|
||||
nameof<Status>(x => x.updatedAt),
|
||||
nameof<Status>(x => x.createdAt),
|
||||
nameof<Status>(x => x.hash),
|
||||
nameof<Status>(x => x.isActive)
|
||||
];
|
||||
|
||||
rowIdentity = x => x.id;
|
||||
|
||||
constructor(
|
||||
public routerUtils: RouterUtilsService,
|
||||
protected router: Router,
|
||||
protected route: ActivatedRoute,
|
||||
protected uiNotificationService: UiNotificationService,
|
||||
protected httpErrorHandlingService: HttpErrorHandlingService,
|
||||
protected queryParamsService: QueryParamsService,
|
||||
private statusService: StatusService,
|
||||
public authService: AuthService,
|
||||
private pipeService: PipeService,
|
||||
public enumUtils: AnnotationServiceEnumUtils,
|
||||
private language: TranslateService,
|
||||
private dialog: MatDialog
|
||||
) {
|
||||
super(router, route, uiNotificationService, httpErrorHandlingService, queryParamsService);
|
||||
// Lookup setup
|
||||
// Default lookup values are defined in the user settings class.
|
||||
this.lookup = this.initializeLookup();
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
super.ngOnInit();
|
||||
}
|
||||
|
||||
protected initializeLookup(): StatusLookup {
|
||||
const lookup = new StatusLookup();
|
||||
lookup.metadata = { countAll: true };
|
||||
lookup.page = { offset: 0, size: this.ITEMS_PER_PAGE };
|
||||
lookup.isActive = [IsActive.Active];
|
||||
lookup.order = { items: [this.toDescSortField(nameof<Status>(x => x.createdAt))] };
|
||||
this.updateOrderUiFields(lookup.order);
|
||||
|
||||
lookup.project = {
|
||||
fields: this.lookupFields
|
||||
};
|
||||
|
||||
return lookup;
|
||||
}
|
||||
|
||||
protected setupColumns() {
|
||||
this.gridColumns.push(...[{
|
||||
prop: nameof<Status>(x => x.label),
|
||||
sortable: true,
|
||||
languageName: 'ANNOTATION-SERVICE.STATUS-LISTING.FIELDS.LABEL',
|
||||
},
|
||||
{
|
||||
prop: nameof<Status>(x => x.internalStatus),
|
||||
sortable: true,
|
||||
languageName: 'ANNOTATION-SERVICE.STATUS-LISTING.FIELDS.INTERNAL-STATUS',
|
||||
pipe: this.pipeService.getPipe<InternalStatusTypePipe>(InternalStatusTypePipe)
|
||||
},
|
||||
{
|
||||
prop: nameof<Status>(x => x.createdAt),
|
||||
sortable: true,
|
||||
languageName: 'ANNOTATION-SERVICE.STATUS-LISTING.FIELDS.CREATED-AT',
|
||||
pipe: this.pipeService.getPipe<DataTableDateTimeFormatPipe>(DataTableDateTimeFormatPipe).withFormat('short')
|
||||
},
|
||||
{
|
||||
prop: nameof<Status>(x => x.updatedAt),
|
||||
sortable: true,
|
||||
languageName: 'ANNOTATION-SERVICE.STATUS-LISTING.FIELDS.UPDATED-AT',
|
||||
pipe: this.pipeService.getPipe<DataTableDateTimeFormatPipe>(DataTableDateTimeFormatPipe).withFormat('short')
|
||||
},
|
||||
{
|
||||
prop: nameof<Status>(x => x.isActive),
|
||||
sortable: true,
|
||||
languageName: 'ANNOTATION-SERVICE.STATUS-LISTING.FIELDS.IS-ACTIVE',
|
||||
pipe: this.pipeService.getPipe<IsActiveTypePipe>(IsActiveTypePipe)
|
||||
},
|
||||
{
|
||||
alwaysShown: true,
|
||||
cellTemplate: this.actions,
|
||||
maxWidth: 120
|
||||
}
|
||||
]);
|
||||
this.propertiesAvailableForOrder = this.gridColumns.filter(x => x.sortable);
|
||||
}
|
||||
|
||||
//
|
||||
// Listing Component functions
|
||||
//
|
||||
onColumnsChanged(event: ColumnsChangedEvent) {
|
||||
super.onColumnsChanged(event);
|
||||
this.onColumnsChangedInternal(event.properties.map(x => x.toString()));
|
||||
}
|
||||
|
||||
private onColumnsChangedInternal(columns: string[]) {
|
||||
// Here are defined the projection fields that always requested from the api.
|
||||
const fields = new Set(this.lookupFields);
|
||||
this.gridColumns.map(x => x.prop)
|
||||
.filter(x => !columns?.includes(x as string))
|
||||
.forEach(item => {
|
||||
fields.delete(item as string)
|
||||
});
|
||||
this.lookup.project = { fields: [...fields] };
|
||||
this.onPageLoad({ offset: 0 } as PageLoadEvent);
|
||||
}
|
||||
|
||||
protected loadListing(): Observable<QueryResult<Status>> {
|
||||
return this.statusService.query(this.lookup);
|
||||
}
|
||||
|
||||
public deleteType(id: Guid) {
|
||||
if (id) {
|
||||
const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
|
||||
data: {
|
||||
isDeleteConfirmation: true,
|
||||
message: this.language.instant('GENERAL.CONFIRMATION-DIALOG.DELETE-ITEM'),
|
||||
confirmButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CONFIRM'),
|
||||
cancelButton: this.language.instant('GENERAL.CONFIRMATION-DIALOG.ACTIONS.CANCEL')
|
||||
}
|
||||
});
|
||||
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
|
||||
if (result) {
|
||||
this.statusService.delete(id).pipe(takeUntil(this._destroyed))
|
||||
.subscribe(
|
||||
complete => this.onCallbackSuccess(),
|
||||
error => this.onCallbackError(error)
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
onCallbackSuccess(): void {
|
||||
this.uiNotificationService.snackBarNotification(this.language.instant('GENERAL.SNACK-BAR.SUCCESSFUL-DELETE'), SnackBarNotificationLevel.Success);
|
||||
this.refresh();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
import { DragDropModule } from '@angular/cdk/drag-drop';
|
||||
import { NgModule } from "@angular/core";
|
||||
import { AutoCompleteModule } from "@app/library/auto-complete/auto-complete.module";
|
||||
import { CommonFormattingModule } from '@common/formatting/common-formatting.module';
|
||||
import { CommonFormsModule } from '@common/forms/common-forms.module';
|
||||
import { ConfirmationDialogModule } from '@common/modules/confirmation-dialog/confirmation-dialog.module';
|
||||
import { HybridListingModule } from "@common/modules/hybrid-listing/hybrid-listing.module";
|
||||
import { TextFilterModule } from "@common/modules/text-filter/text-filter.module";
|
||||
import { UserSettingsModule } from "@common/modules/user-settings/user-settings.module";
|
||||
import { CommonUiModule } from '@common/ui/common-ui.module';
|
||||
import { NgxDropzoneModule } from "ngx-dropzone";
|
||||
import { StatusListingComponent } from './listing/status-listing.component';
|
||||
import { RichTextEditorModule } from '@app/library/rich-text-editor/rich-text-editor.module';
|
||||
import { MatIconModule } from '@angular/material/icon';
|
||||
import { EditorModule } from '@tinymce/tinymce-angular';
|
||||
import { StatusRoutingModule } from './status.routing';
|
||||
import { AnnotationServiceFormattingModule } from '@annotation-service/core/formatting/formatting.module';
|
||||
import { StatusListingFiltersComponent } from './listing/filters/status-listing-filters.component';
|
||||
import { StatusEditorComponent } from './editor/status-editor.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonUiModule,
|
||||
CommonFormsModule,
|
||||
ConfirmationDialogModule,
|
||||
StatusRoutingModule,
|
||||
NgxDropzoneModule,
|
||||
DragDropModule,
|
||||
AutoCompleteModule,
|
||||
HybridListingModule,
|
||||
TextFilterModule,
|
||||
UserSettingsModule,
|
||||
CommonFormattingModule,
|
||||
RichTextEditorModule,
|
||||
MatIconModule,
|
||||
EditorModule,
|
||||
AnnotationServiceFormattingModule
|
||||
],
|
||||
declarations: [
|
||||
StatusEditorComponent,
|
||||
StatusListingComponent,
|
||||
StatusListingFiltersComponent,
|
||||
]
|
||||
})
|
||||
export class StatusModule { }
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule, Routes } from '@angular/router';
|
||||
import { AppPermission } from '@app/core/common/enum/permission.enum';
|
||||
import { AuthGuard } from '@app/core/auth-guard.service';
|
||||
import { BreadcrumbService } from '@app/ui/misc/breadcrumb/breadcrumb.service';
|
||||
import { PendingChangesGuard } from '@common/forms/pending-form-changes/pending-form-changes-guard.service';
|
||||
import { StatusListingComponent } from './listing/status-listing.component';
|
||||
import { StatusEditorResolver } from './editor/status-editor.resolver';
|
||||
import { StatusEditorComponent } from './editor/status-editor.component';
|
||||
|
||||
const routes: Routes = [
|
||||
{
|
||||
path: '',
|
||||
component: StatusListingComponent,
|
||||
canActivate: [AuthGuard]
|
||||
},
|
||||
{
|
||||
path: 'new',
|
||||
canActivate: [AuthGuard],
|
||||
component: StatusEditorComponent,
|
||||
canDeactivate: [PendingChangesGuard],
|
||||
data: {
|
||||
authContext: {
|
||||
permissions: [AppPermission.EditStatus]
|
||||
},
|
||||
...BreadcrumbService.generateRouteDataConfiguration({
|
||||
title: 'BREADCRUMBS.NEW-TENANT'
|
||||
}),
|
||||
getFromTitleService: true,
|
||||
usePrefix: false
|
||||
}
|
||||
},
|
||||
{
|
||||
path: ':id',
|
||||
canActivate: [AuthGuard],
|
||||
component: StatusEditorComponent,
|
||||
canDeactivate: [PendingChangesGuard],
|
||||
resolve: {
|
||||
'entity': StatusEditorResolver
|
||||
},
|
||||
data: {
|
||||
authContext: {
|
||||
permissions: [AppPermission.EditStatus]
|
||||
},
|
||||
getFromTitleService: true,
|
||||
usePrefix: false
|
||||
}
|
||||
|
||||
},
|
||||
{ path: '**', loadChildren: () => import('@common/modules/page-not-found/page-not-found.module').then(m => m.PageNotFoundModule) },
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [RouterModule.forChild(routes)],
|
||||
exports: [RouterModule],
|
||||
providers: [StatusEditorResolver]
|
||||
})
|
||||
export class StatusRoutingModule { }
|
||||
|
|
@ -353,6 +353,19 @@ const appRoutes: Routes = [
|
|||
title: 'GENERAL.TITLES.ENTITY-LOCKS'
|
||||
},
|
||||
},
|
||||
{
|
||||
path: 'annotation-statuses',
|
||||
loadChildren: () => import('@annotation-service/ui/admin/status/status.module').then(m => m.StatusModule),
|
||||
data: {
|
||||
authContext: {
|
||||
permissions: [AppPermission.ViewStatusPage]
|
||||
},
|
||||
...BreadcrumbService.generateRouteDataConfiguration({
|
||||
title: 'BREADCRUMBS.ANNOTATION-STATUSES'
|
||||
}),
|
||||
title: 'GENERAL.TITLES.ANNOTATION-STATUSES'
|
||||
},
|
||||
},
|
||||
{
|
||||
path: 'maintenance-tasks',
|
||||
loadChildren: () => import('./ui/admin/maintenance-tasks/maintenance-tasks.module').then(m => m.MaintenanceTasksModule),
|
||||
|
|
|
|||
|
|
@ -195,6 +195,11 @@ export enum AppPermission {
|
|||
EditPrefillingSource= "EditPrefillingSource",
|
||||
DeletePrefillingSource = "DeletePrefillingSource",
|
||||
|
||||
//Status
|
||||
BrowseStatus = "BrowseStatus",
|
||||
EditStatus = "EditStatus",
|
||||
DeleteStatus = "DeleteStatus",
|
||||
|
||||
|
||||
// UI Pages
|
||||
ViewDescriptionTemplateTypePage = "ViewDescriptionTemplateTypePage",
|
||||
|
|
@ -219,5 +224,6 @@ export enum AppPermission {
|
|||
ViewHomePage = "ViewHomePage",
|
||||
ViewMineInAppNotificationPage = "ViewMineInAppNotificationPage",
|
||||
ViewTenantConfigurationPage = "ViewTenantConfigurationPage",
|
||||
ViewStatusPage = "ViewStatusPage",
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -119,6 +119,7 @@ export class SidebarComponent implements OnInit {
|
|||
if (this.authentication.hasPermission(AppPermission.ViewSupportiveMaterialPage)) this.adminItems.routes.push({ path: '/supportive-material', title: 'SIDE-BAR.SUPPORTIVE-MATERIAL', icon: 'help_center' });
|
||||
if (this.authentication.hasPermission(AppPermission.ViewNotificationTemplatePage)) this.adminItems.routes.push({ path: '/notification-templates', title: 'SIDE-BAR.NOTIFICATION-TEMPLATES', icon: 'grid_guides' });
|
||||
if (this.authentication.hasPermission(AppPermission.ViewNotificationPage)) this.adminItems.routes.push({ path: '/notifications', title: 'SIDE-BAR.NOTIFICATIONS', icon: 'notifications' });
|
||||
if (this.authentication.hasPermission(AppPermission.ViewStatusPage)) this.adminItems.routes.push({ path: '/annotation-statuses', title: 'SIDE-BAR.ANNOTATION-STATUSES', icon: 'notifications' });
|
||||
if (this.authentication.hasPermission(AppPermission.ViewMaintenancePage)) this.adminItems.routes.push({ path: '/maintenance-tasks', title: 'SIDE-BAR.MAINTENANCE', icon: 'build' });
|
||||
this.groupMenuItems.push(this.adminItems);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue