MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

added annotations to Plan editor too.

This commit is contained in:
Diamantis Tziotzios 2024-07-12 17:47:09 +03:00
parent 33c8f908e6
commit 0f9653cafc
36 changed files with 178 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/core/src/main/java/org/opencdmp/authorization/Permission.java
View File

@ -85,6 +85,8 @@ public final class Permission {
public static String UndoFinalizePlan = "UndoFinalizePlan";
public static String AssignPlanUsers = "AssignPlanUsers";
public static String InvitePlanUsers = "InvitePlanUsers";
public static String AnnotatePlan = "AnnotatePlan";
//PlanBlueprint
public static String BrowsePlanBlueprint = "BrowsePlanBlueprint";
@ -107,7 +109,7 @@ public final class Permission {
//Description
public static String BrowseDescription = "BrowseDescription";
public static String ReviewDescription = "ReviewDescription";
public static String AnnotateDescription = "AnnotateDescription";
public static String EditDescription = "EditDescription";
public static String FinalizeDescription = "FinalizeDescription";
public static String DeleteDescription = "DeleteDescription";

9
backend/core/src/main/java/org/opencdmp/integrationevent/outbox/annotationentitytouch/AnnotationEntityTouchedIntegrationEventHandlerImpl.java
View File

@ -5,12 +5,15 @@ import gr.cite.tools.fieldset.BaseFieldSet;
import gr.cite.tools.logging.LoggerService;
import org.opencdmp.commons.enums.IsActive;
import org.opencdmp.data.DescriptionEntity;
import org.opencdmp.data.PlanEntity;
import org.opencdmp.data.PlanUserEntity;
import org.opencdmp.integrationevent.outbox.OutboxIntegrationEvent;
import org.opencdmp.integrationevent.outbox.OutboxService;
import org.opencdmp.model.PlanUser;
import org.opencdmp.model.description.Description;
import org.opencdmp.model.plan.Plan;
import org.opencdmp.query.DescriptionQuery;
import org.opencdmp.query.PlanQuery;
import org.opencdmp.query.PlanUserQuery;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@ -60,16 +63,18 @@ public class AnnotationEntityTouchedIntegrationEventHandlerImpl implements Annot
@Override
public void handlePlan(UUID planId) {
List<DescriptionEntity> descriptionEntities = this.queryFactory.query(DescriptionQuery.class).disableTracking().planIds(planId).collectAs(new BaseFieldSet().ensure(Description._id));
if (descriptionEntities == null || descriptionEntities.isEmpty()) return;
PlanEntity planEntity = this.queryFactory.query(PlanQuery.class).disableTracking().ids(planId).firstAs(new BaseFieldSet().ensure(Plan._id, Plan._tenantId));
List<PlanUserEntity> planUsers = this.queryFactory.query(PlanUserQuery.class).disableTracking().planIds(planId).isActives(IsActive.Active).collectAs(new BaseFieldSet().ensure(PlanUser._user));
AnnotationEntitiesTouchedIntegrationEvent event = new AnnotationEntitiesTouchedIntegrationEvent();
event.setEvents(new ArrayList<>());
event.getEvents().add(this.buildEventItem(planId, planUsers));
if (descriptionEntities != null) {
for (DescriptionEntity description : descriptionEntities) event.getEvents().add(this.buildEventItem(description.getId(), planUsers));
}
this.handle(event, descriptionEntities.getFirst().getTenantId());
this.handle(event, planEntity.getTenantId());
}
private AnnotationEntitiesTouchedIntegrationEvent.AnnotationEntityTouchedIntegrationEvent buildEventItem(UUID entityId, List<PlanUserEntity> planUsers){

14
backend/web/src/main/resources/config/permissions.yml
View File

@ -199,7 +199,7 @@ permissions:
clients: [ ]
allowAnonymous: false
allowAuthenticated: false
ReviewDescription:
AnnotateDescription:
roles:
- Admin
- TenantAdmin
@ -604,6 +604,18 @@ permissions:
clients: [ ]
allowAnonymous: false
allowAuthenticated: false
AnnotatePlan:
roles:
- Admin
- TenantAdmin
plan:
roles:
- Owner
- DescriptionContributor
- Reviewer
clients: [ ]
allowAnonymous: false
allowAuthenticated: false
# PlanBlueprint
BrowsePlanBlueprint:
roles:

3
frontend/src/app/core/common/enum/permission.enum.ts
View File

@ -81,6 +81,7 @@ export enum AppPermission {
UndoFinalizePlan = "UndoFinalizePlan",
AssignPlanUsers = "AssignPlanUsers",
InvitePlanUsers = "InvitePlanUsers",
AnnotatePlan = "AnnotatePlan",
//PlanBlueprint
BrowsePlanBlueprint = "BrowsePlanBlueprint",
@ -103,7 +104,7 @@ export enum AppPermission {
//Description
BrowseDescription = "BrowseDescription",
ReviewDescription = "ReviewDescription",
AnnotateDescription = "AnnotateDescription",
EditDescription = "EditDescription",
FinalizeDescription = "FinalizeDescription",
DeleteDescription = "DeleteDescription",

2
frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html
View File

@ -7,7 +7,7 @@
<mat-progress-bar color="primary" mode="indeterminate"></mat-progress-bar>
</div>
<div mat-dialog-content class="definition-content">
<app-description-form *ngIf="formGroup && formGroup.get('properties')" [propertiesFormGroup]="previewPropertiesFormGroup" [descriptionId]="descriptionId" [descriptionTemplate]="descriptionTemplate" [canReview]="false" [visibilityRulesService]="visibilityRulesService" [isNew]="true"></app-description-form>
<app-description-form *ngIf="formGroup && formGroup.get('properties')" [propertiesFormGroup]="previewPropertiesFormGroup" [descriptionId]="descriptionId" [descriptionTemplate]="descriptionTemplate" [canAnnotate]="false" [visibilityRulesService]="visibilityRulesService" [isNew]="true"></app-description-form>
</div>
<div mat-mat-dialog-actions *ngIf="formGroup">
<div class="col-auto d-flex pb-4 pt-2">

2
frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.html
View File

@ -123,7 +123,7 @@
</div>
<div [id]="'preview_container'+ form.get('id').value" class="row">
<div *ngIf="previewFieldSet && showPreview && firstField?.get('data')?.get('fieldType')?.value" class="col-12" [@fade-in-fast]>
<app-description-form-field-set class="w-100" [canReview]="false" [propertiesFormGroup]="previewPropertiesFormGroup" [fieldSet]="previewFieldSet" [visibilityRulesService]="visibilityRulesService" [numbering]="numbering" [hideAnnotations]="true" [validationErrorModel]="validationErrorModel"></app-description-form-field-set>
<app-description-form-field-set class="w-100" [canAnnotate]="false" [propertiesFormGroup]="previewPropertiesFormGroup" [fieldSet]="previewFieldSet" [visibilityRulesService]="visibilityRulesService" [numbering]="numbering" [hideAnnotations]="true" [validationErrorModel]="validationErrorModel"></app-description-form-field-set>
</div>
</div>
</div>

2
frontend/src/app/ui/admin/description-template/editor/components/final-preview/final-preview.component.html
View File

@ -1 +1 @@
<app-description-form *ngIf="previewPropertiesFormGroup" [canReview]="false" [propertiesFormGroup]="previewPropertiesFormGroup" [descriptionTemplate]="descriptionTemplate" [visibilityRulesService]="visibilityRulesService" [isNew]="true"></app-description-form>
<app-description-form *ngIf="previewPropertiesFormGroup" [canAnnotate]="false" [propertiesFormGroup]="previewPropertiesFormGroup" [descriptionTemplate]="descriptionTemplate" [visibilityRulesService]="visibilityRulesService" [isNew]="true"></app-description-form>

9
frontend/src/app/ui/description/editor/description-form/description-form-annotation.service.ts → frontend/src/app/ui/annotations/annotation-dialog-component/form-annotation.service.ts
View File

@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
import { Annotation } from '@annotation-service/core/model/annotation.model';
import { AnnotationLookup } from '@annotation-service/core/query/annotation.lookup';
import { AnnotationService } from '@annotation-service/services/http/annotation.service';
import { AnnotationEntityType } from '@app/core/common/enum/annotation-entity-type';
import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
import { BaseService } from '@common/base/base.service';
import { Guid } from '@common/types/guid';
@ -15,9 +14,10 @@ import { nameof } from 'ts-simple-nameof';
@Injectable({
providedIn: 'any',
})
export class DescriptionFormAnnotationService extends BaseService {
export class FormAnnotationService extends BaseService {
private entityId: Guid;
private entityType: string;
private annotationsPerAnchor: Map<string, number>;
private annotationCountSubject: BehaviorSubject<Map<string, number>> = new BehaviorSubject<Map<string, number>>(null);
private openAnnotationSubject: Subject<any> = new Subject<any>();
@ -30,8 +30,9 @@ export class DescriptionFormAnnotationService extends BaseService {
super();
}
init(entityId: Guid) {
init(entityId: Guid, entityType: string) {
this.entityId = entityId;
this.entityType = entityType;
this.refreshAnnotations();
}
@ -50,7 +51,7 @@ export class DescriptionFormAnnotationService extends BaseService {
public refreshAnnotations() {
const lookup: AnnotationLookup = new AnnotationLookup();
lookup.entityIds = [this.entityId];
lookup.entityTypes = [AnnotationEntityType.Description];
lookup.entityTypes = [this.entityType];
lookup.project = {
fields: [
nameof<Annotation>(x => x.id),

2
frontend/src/app/ui/description/editor/description-editor.component.html
View File

@ -177,7 +177,7 @@
[linkToScroll]="linkToScroll"
[validationErrorModel]="editorModel.validationErrorModel"
[isNew]="isNew || isCopy"
[canReview]="canReview"
[canAnnotate]="canAnnotate"
[planUsers]="item?.plan?.planUsers ?? []"
></app-description-form>
</div>

10
frontend/src/app/ui/description/editor/description-editor.component.ts
View File

@ -44,7 +44,7 @@ import { TableOfContentsService } from './table-of-contents/services/table-of-co
import { TableOfContentsComponent } from './table-of-contents/table-of-contents.component';
import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
import { DescriptionFormService } from './description-form/components/services/description-form.service';
import { DescriptionFormAnnotationService } from './description-form/description-form-annotation.service';
import { FormAnnotationService } from '../../annotations/annotation-dialog-component/form-annotation.service';
@Component({
selector: 'app-description-editor-component',
@ -58,7 +58,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
isDeleted = false;
isCopy = false;
canEdit = false;
canReview = false;
canAnnotate = false;
item: Description;
fileTransformerEntityTypeEnum = FileTransformerEntityType;
@ -110,7 +110,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
private changeDetectorRef: ChangeDetectorRef,
private tableOfContentsService: TableOfContentsService,
private descriptionFormService: DescriptionFormService,
private descriptionFormAnnotationService: DescriptionFormAnnotationService,
private formAnnotationService: FormAnnotationService,
) {
const descriptionLabel: string = route.snapshot.data['entity']?.label;
if (descriptionLabel) {
@ -194,7 +194,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
ngAfterViewInit(): void {
if (this.scrollToField && this.anchorFieldsetId && this.anchorFieldsetId != '') {
this.descriptionFormService.scrollingToAnchor(this.anchorFieldsetId);
if (this.openAnnotation) this.descriptionFormAnnotationService.οpenAnnotationDialog(this.anchorFieldsetId);
if (this.openAnnotation) this.formAnnotationService.οpenAnnotationDialog(this.anchorFieldsetId);
}
}
@ -234,7 +234,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
buildForm() {
this.canEdit = this.permissionPerSection && this.permissionPerSection[this.item.planDescriptionTemplate.sectionId.toString()] && this.permissionPerSection[this.item.planDescriptionTemplate.sectionId.toString()].some(x => x === AppPermission.EditDescription);
this.canReview = this.permissionPerSection && this.permissionPerSection[this.item.planDescriptionTemplate.sectionId.toString()] && this.permissionPerSection[this.item.planDescriptionTemplate.sectionId.toString()].some(x => x === AppPermission.ReviewDescription);
this.canAnnotate = this.permissionPerSection && this.permissionPerSection[this.item.planDescriptionTemplate.sectionId.toString()] && this.permissionPerSection[this.item.planDescriptionTemplate.sectionId.toString()].some(x => x === AppPermission.AnnotateDescription);
this.formGroup = this.editorModel.buildForm(null, this.isDeleted || !this.canEdit, this.visibilityRulesService);
if (this.item.descriptionTemplate?.definition) this.visibilityRulesService.setContext(this.item.descriptionTemplate.definition, this.formGroup.get('properties'));
if (this.item.descriptionTemplate?.definition) this.pageToFieldSetMap = this.mapPageToFieldSet(this.item.descriptionTemplate);;

2
frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.html
View File

@ -6,7 +6,7 @@
<app-description-form-field-set-title [fieldSet]="fieldSet" [path]="path" [isChild]="isChild" [hildeLink]="hideAnnotations" (copyLinkEvent)="copyLink(fieldSet.id)" [isAnchor]="isAnchor"></app-description-form-field-set-title>
</div>
<div *ngIf="!hideAnnotations" class="col-auto" style="margin-top: 1rem;">
<button mat-icon-button class="col-auto annotation-icon" (click)="showAnnotations(fieldSet.id)" matTooltip="{{ 'DESCRIPTION-EDITOR.QUESTION.EXTENDED-DESCRIPTION.ANNOTATIONS' | translate }}" [disabled]="!canReview">
<button mat-icon-button class="col-auto annotation-icon" (click)="showAnnotations(fieldSet.id)" matTooltip="{{ 'DESCRIPTION-EDITOR.QUESTION.EXTENDED-DESCRIPTION.ANNOTATIONS' | translate }}" [disabled]="!canAnnotate">
<mat-icon [matBadge]="annotationsCount" [matBadgeHidden]="annotationsCount <= 0" matBadgeColor="warn">comment</mat-icon>
</button>
</div>

12
frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.ts
View File

@ -13,7 +13,7 @@ import { ValidationErrorModel } from '@common/forms/validation/error-model/valid
import { Guid } from '@common/types/guid';
import { AnnotationDialogComponent } from '@app/ui/annotations/annotation-dialog-component/annotation-dialog.component';
import { AnnotationEntityType } from '@app/core/common/enum/annotation-entity-type';
import { DescriptionFormAnnotationService } from '../../description-form-annotation.service';
import { FormAnnotationService } from '../../../../../annotations/annotation-dialog-component/form-annotation.service';
import { DescriptionPropertyDefinitionFieldSet } from '@app/core/model/description/description';
import { DescriptionFormService } from '../services/description-form.service';
import { DescriptionTemplateFieldType } from '@app/core/common/enum/description-template-field-type';
@ -33,7 +33,7 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
@Input() propertiesFormGroup: UntypedFormGroup;
@Input() descriptionId: Guid;
@Input() hideAnnotations: boolean = false;
@Input() canReview: boolean = false;
@Input() canAnnotate: boolean = false;
@Input() numbering: string;
@Input() planUsers: PlanUser[] = [];
@ -61,7 +61,7 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
private routerUtils: RouterUtilsService,
private dialog: MatDialog,
private changeDetector: ChangeDetectorRef,
private descriptionFormAnnotationService: DescriptionFormAnnotationService,
private formAnnotationService: FormAnnotationService,
private descriptionFormService: DescriptionFormService,
private uiNotificationService: UiNotificationService,
private language: TranslateService,
@ -72,7 +72,7 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
ngOnInit() {
this.descriptionFormService.getDetectChangesObservable().pipe(takeUntil(this._destroyed)).subscribe( _ => this.changeDetector.detectChanges() );
this.descriptionFormAnnotationService.getAnnotationCountObservable().pipe(takeUntil(this._destroyed)).subscribe((annotationsPerAnchor: Map<string, number>) => {
this.formAnnotationService.getAnnotationCountObservable().pipe(takeUntil(this._destroyed)).subscribe((annotationsPerAnchor: Map<string, number>) => {
const newCount = annotationsPerAnchor?.has(this.fieldSet.id) ? annotationsPerAnchor.get(this.fieldSet.id) : 0;
if (newCount != this.annotationsCount) {
this.annotationsCount = newCount;
@ -80,7 +80,7 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
}
});
this.descriptionFormAnnotationService.getOpenAnnotationSubjectObservable().pipe(takeUntil(this._destroyed)).subscribe((anchorFieldsetId: string) => {
this.formAnnotationService.getOpenAnnotationSubjectObservable().pipe(takeUntil(this._destroyed)).subscribe((anchorFieldsetId: string) => {
if (anchorFieldsetId && anchorFieldsetId == this.fieldSet.id) this.showAnnotations(anchorFieldsetId);
});
@ -191,7 +191,7 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
});
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(changesMade => {
if (changesMade) {
this.descriptionFormAnnotationService.refreshAnnotations();
this.formAnnotationService.refreshAnnotations();
}
});
}

4
frontend/src/app/ui/description/editor/description-form/components/form-section/form-section.component.html
View File

@ -24,7 +24,7 @@
[validationErrorModel]="validationErrorModel"
[isChild]="false"
[hideAnnotations]="isNew"
[canReview]="canReview"
[canAnnotate]="canAnnotate"
[planUsers]="planUsers"
></app-description-form-field-set>
</div>
@ -35,7 +35,7 @@
<div *ngIf="section?.sections?.length > 0" class="col-12">
<ng-container *ngFor="let innerSection of section.sections; let j = index;">
<div class="row" *ngIf="visibilityRulesService.isVisibleMap[innerSection.id]">
<app-description-form-section class="col-12" [section]="innerSection" [canReview]="canReview" [path]="path+'.'+(j+1)" [pathName]="pathName+'.sections.'+j" (askedToScroll)="onAskedToScroll(null, $event)" [propertiesFormGroup]="propertiesFormGroup" [descriptionId]="descriptionId" [visibilityRulesService]="visibilityRulesService" [linkToScroll]="subsectionLinkToScroll"></app-description-form-section>
<app-description-form-section class="col-12" [section]="innerSection" [canAnnotate]="canAnnotate" [path]="path+'.'+(j+1)" [pathName]="pathName+'.sections.'+j" (askedToScroll)="onAskedToScroll(null, $event)" [propertiesFormGroup]="propertiesFormGroup" [descriptionId]="descriptionId" [visibilityRulesService]="visibilityRulesService" [linkToScroll]="subsectionLinkToScroll"></app-description-form-section>
</div>
</ng-container>
</div>

2
frontend/src/app/ui/description/editor/description-form/components/form-section/form-section.component.ts
View File

@ -20,7 +20,7 @@ import { PlanUser } from '@app/core/model/plan/plan';
export class DescriptionFormSectionComponent extends BaseComponent implements OnInit, OnChanges {
@Input() isNew: boolean = false;
@Input() canReview: boolean = false;
@Input() canAnnotate: boolean = false;
@Input() section: DescriptionTemplateSection;
@Input() propertiesFormGroup: UntypedFormGroup;
@Input() visibilityRulesService: VisibilityRulesService;

2
frontend/src/app/ui/description/editor/description-form/description-form.component.html
View File

@ -15,7 +15,7 @@
</mat-expansion-panel-header>
<ng-container *ngFor="let section of page.sections; let i = index;">
<div class="row" *ngIf="visibilityRulesService.isVisibleMap[section.id]">
<app-description-form-section class="col-12" [section]="section" [canReview]="canReview" [path]="(z+1)+'.'+(i+1)" [pathName]="'pages.'+z+'.sections.'+i" [propertiesFormGroup]="propertiesFormGroup" [descriptionId]="descriptionId" [visibilityRulesService]="visibilityRulesService" (askedToScroll)="onAskedToScroll(expansionPanel, $event)" [linkToScroll]="linkToScroll" [validationErrorModel]="validationErrorModel" [isNew]="isNew" [planUsers]="planUsers"></app-description-form-section>
<app-description-form-section class="col-12" [section]="section" [canAnnotate]="canAnnotate" [path]="(z+1)+'.'+(i+1)" [pathName]="'pages.'+z+'.sections.'+i" [propertiesFormGroup]="propertiesFormGroup" [descriptionId]="descriptionId" [visibilityRulesService]="visibilityRulesService" (askedToScroll)="onAskedToScroll(expansionPanel, $event)" [linkToScroll]="linkToScroll" [validationErrorModel]="validationErrorModel" [isNew]="isNew" [planUsers]="planUsers"></app-description-form-section>
</div>
</ng-container>
</mat-expansion-panel>

9
frontend/src/app/ui/description/editor/description-form/description-form.component.ts
View File

@ -6,9 +6,10 @@ import { BaseComponent } from '@common/base/base.component';
import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
import { Guid } from '@common/types/guid';
import { LinkToScroll } from '../table-of-contents/table-of-contents.component';
import { DescriptionFormAnnotationService } from './description-form-annotation.service';
import { FormAnnotationService } from '../../../annotations/annotation-dialog-component/form-annotation.service';
import { VisibilityRulesService } from './visibility-rules/visibility-rules.service';
import { PlanUser } from '@app/core/model/plan/plan';
import { AnnotationEntityType } from '@app/core/common/enum/annotation-entity-type';
@Component({
selector: 'app-description-form',
@ -22,7 +23,7 @@ export class DescriptionFormComponent extends BaseComponent implements OnInit, O
@Input() visibilityRulesService: VisibilityRulesService;
@Input() descriptionId: Guid;
@Input() isNew: boolean = false;
@Input() canReview: boolean = false;
@Input() canAnnotate: boolean = false;
@Input() path: string;
@Input() datasetDescription: String;
@Input() linkToScroll: LinkToScroll;
@ -32,7 +33,7 @@ export class DescriptionFormComponent extends BaseComponent implements OnInit, O
@Output() formChanged: EventEmitter<any> = new EventEmitter();
constructor(
public descriptionFormAnnotationService: DescriptionFormAnnotationService,
public formAnnotationService: FormAnnotationService,
) {
super();
@ -45,7 +46,7 @@ export class DescriptionFormComponent extends BaseComponent implements OnInit, O
ngOnChanges(changes: SimpleChanges) {
this.init();
if (this.descriptionId != null) {
this.descriptionFormAnnotationService.init(this.descriptionId);
this.formAnnotationService.init(this.descriptionId, AnnotationEntityType.Description);
}
}

4
frontend/src/app/ui/description/editor/description-form/description-form.module.ts
View File

@ -13,7 +13,7 @@ import { DescriptionFormFieldSetComponent } from './components/form-field-set/fo
import { DescriptionFormFieldComponent } from './components/form-field/form-field.component';
import { DescriptionFormSectionComponent } from './components/form-section/form-section.component';
import { DescriptionFormComponent } from './description-form.component';
import { DescriptionFormAnnotationService } from './description-form-annotation.service';
import { FormAnnotationService } from '../../../annotations/annotation-dialog-component/form-annotation.service';
import { TagsFieldModule } from '@app/ui/tag/tags-field/tags-field.module';
import { DescriptionFormService } from './components/services/description-form.service';
@ -43,7 +43,7 @@ import { DescriptionFormService } from './components/services/description-form.s
DescriptionFormFieldSetComponent
],
providers: [
DescriptionFormAnnotationService,
FormAnnotationService,
DescriptionFormService,
]
})

2
frontend/src/app/ui/description/editor/resolvers/description-editor-entity.resolver.ts
View File

@ -58,7 +58,7 @@ export class DescriptionEditorEntityResolver extends BaseEditorResolver {
[nameof<Description>(x => x.authorizationFlags), AppPermission.EditDescription].join('.'),
[nameof<Description>(x => x.authorizationFlags), AppPermission.DeleteDescription].join('.'),
[nameof<Description>(x => x.authorizationFlags), AppPermission.FinalizeDescription].join('.'),
[nameof<Description>(x => x.authorizationFlags), AppPermission.ReviewDescription].join('.'),
[nameof<Description>(x => x.authorizationFlags), AppPermission.AnnotateDescription].join('.'),
[nameof<Description>(x => x.planDescriptionTemplate), nameof<PlanDescriptionTemplate>(x => x.id)].join('.'),
[nameof<Description>(x => x.planDescriptionTemplate), nameof<PlanDescriptionTemplate>(x => x.sectionId)].join('.'),

6
frontend/src/app/ui/description/editor/resolvers/description-editor-permissions.resolver.ts
View File

@ -40,7 +40,7 @@ export class DescriptionEditorPermissionsResolver extends BaseEditorResolver {
const descriptionSectionPermissionResolverModel: DescriptionSectionPermissionResolver = {
planId: description.plan.id,
sectionIds: [description.planDescriptionTemplate.sectionId],
permissions: [AppPermission.EditDescription, AppPermission.DeleteDescription, AppPermission.FinalizeDescription, AppPermission.ReviewDescription]
permissions: [AppPermission.EditDescription, AppPermission.DeleteDescription, AppPermission.FinalizeDescription, AppPermission.AnnotateDescription]
}
return this.descriptionService.getDescriptionSectionPermissions(descriptionSectionPermissionResolverModel).pipe(takeUntil(this._destroyed));
}));
@ -62,7 +62,7 @@ export class DescriptionEditorPermissionsResolver extends BaseEditorResolver {
const descriptionSectionPermissionResolverModel: DescriptionSectionPermissionResolver = {
planId: description.plan.id,
sectionIds: [description.planDescriptionTemplate.sectionId],
permissions: [AppPermission.EditDescription, AppPermission.DeleteDescription, AppPermission.FinalizeDescription, AppPermission.ReviewDescription]
permissions: [AppPermission.EditDescription, AppPermission.DeleteDescription, AppPermission.FinalizeDescription, AppPermission.AnnotateDescription]
}
return this.descriptionService.getDescriptionSectionPermissions(descriptionSectionPermissionResolverModel).pipe(takeUntil(this._destroyed));
}));
@ -90,7 +90,7 @@ export class DescriptionEditorPermissionsResolver extends BaseEditorResolver {
const descriptionSectionPermissionResolverModel: DescriptionSectionPermissionResolver = {
planId: description.plan.id,
sectionIds: [description.planDescriptionTemplate.sectionId],
permissions: [AppPermission.EditDescription, AppPermission.DeleteDescription, AppPermission.FinalizeDescription, AppPermission.ReviewDescription]
permissions: [AppPermission.EditDescription, AppPermission.DeleteDescription, AppPermission.FinalizeDescription, AppPermission.AnnotateDescription]
}
return this.descriptionService.getDescriptionSectionPermissions(descriptionSectionPermissionResolverModel).pipe(takeUntil(this._destroyed));
}));

2
frontend/src/app/ui/description/overview/description-overview.component.html
View File

@ -44,7 +44,7 @@
</div>
</div>
<div class="row mb-4 pb-3">
<div *ngIf="(canEdit || canReview) && isDraftDescription(description) && !isLocked; else previewButton" class="col-auto pr-0">
<div *ngIf="(canEdit || canAnnotate) && isDraftDescription(description) && !isLocked; else previewButton" class="col-auto pr-0">
<button (click)="editClicked(description)" mat-mini-fab class="mr-3 actions-btn" matTooltip="{{'DESCRIPTION-OVERVIEW.ACTIONS.EDIT' | translate}}" matTooltipPosition="above">
<mat-icon class="mat-mini-fab-icon">create</mat-icon>
</button>

8
frontend/src/app/ui/description/overview/description-overview.component.ts
View File

@ -70,7 +70,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
canEdit = false;
canDelete = false;
canFinalize = false;
canReview = false;
canAnnotate = false;
canInvitePlanUsers = false;
authorFocus: string;
@ -135,8 +135,8 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
this.canEdit = (this.authService.hasPermission(AppPermission.EditDescription) ||
this.description.authorizationFlags?.some(x => x === AppPermission.EditDescription)) && this.description.belongsToCurrentTenant != false;
this.canReview = (this.authService.hasPermission(AppPermission.ReviewDescription) ||
this.description.authorizationFlags?.some(x => x === AppPermission.ReviewDescription)) && this.description.belongsToCurrentTenant != false;
this.canAnnotate = (this.authService.hasPermission(AppPermission.AnnotateDescription) ||
this.description.authorizationFlags?.some(x => x === AppPermission.AnnotateDescription)) && this.description.belongsToCurrentTenant != false;
this.canFinalize = (this.authService.hasPermission(AppPermission.FinalizeDescription) ||
this.description.authorizationFlags?.some(x => x === AppPermission.FinalizeDescription)) && this.description.belongsToCurrentTenant != false;
@ -485,7 +485,7 @@ export class DescriptionOverviewComponent extends BaseComponent implements OnIni
[nameof<Description>(x => x.authorizationFlags), AppPermission.DeleteDescription].join('.'),
[nameof<Description>(x => x.authorizationFlags), AppPermission.FinalizeDescription].join('.'),
[nameof<Description>(x => x.authorizationFlags), AppPermission.InvitePlanUsers].join('.'),
[nameof<Description>(x => x.authorizationFlags), AppPermission.ReviewDescription].join('.'),
[nameof<Description>(x => x.authorizationFlags), AppPermission.AnnotateDescription].join('.'),
[nameof<Description>(x => x.descriptionTemplate), nameof<DescriptionTemplate>(x => x.id)].join('.'),
[nameof<Description>(x => x.descriptionTemplate), nameof<DescriptionTemplate>(x => x.label)].join('.'),

14
frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.html
View File

@ -198,10 +198,21 @@
<div class="row">
<div class="col-12">
<div *ngFor="let field of section.fields; let j=index">
<div class="row align-items-start">
<div class="col">
<div class="heading" *ngIf="!field.label && field.category === planBlueprintSectionFieldCategoryEnum.System">{{i + 1}}.{{j + 1}} {{enumUtils.toPlanBlueprintSystemFieldTypeString(field.systemFieldType)}}<span *ngIf="field.required">*</span></div>
<div class="heading" *ngIf="!field.label && field.category === planBlueprintSectionFieldCategoryEnum.ReferenceType">{{i + 1}}.{{j + 1}} {{field.referenceType.name}}<span *ngIf="field.required">*</span></div>
<div class="heading" *ngIf="field.label">{{i + 1}}.{{j + 1}} {{field.label}}<span *ngIf="field.required">*</span></div>
</div>
<div *ngIf="!isNew" class="col-auto" style="margin-top: 1rem;">
<button mat-icon-button class="col-auto annotation-icon" (click)="showAnnotations(field.id)" matTooltip="{{ 'PLAN-EDITOR.ACTIONS.ANNOTATIONS' | translate }}" [disabled]="!canAnnotate(section.id)">
<mat-icon [matBadge]="annotationsPerAnchor.get(field.id)" [matBadgeHidden]="annotationsPerAnchor.get(field.id) <= 0" matBadgeColor="warn">comment</mat-icon>
</button>
</div>
</div>
<div *ngIf="field.description != null && field.description.length > 0" class="hint">{{field.description}}</div>
<div class="input-form">
<div *ngIf="field.category === planBlueprintSectionFieldCategoryEnum.System">
<div *ngIf="field.systemFieldType == planBlueprintSystemFieldTypeEnum.Title">
@ -298,7 +309,8 @@
</div>
<div *ngIf="field.systemFieldType == planBlueprintSystemFieldTypeEnum.User">
<div>
<app-plan-user-field-component [form]="formGroup" [validationErrorModel]="editorModel.validationErrorModel" [sections]="selectedBlueprint.definition.sections" [viewOnly]="formGroup.disabled || !canEdit"></app-plan-user-field-component> </div>
<app-plan-user-field-component [form]="formGroup" [validationErrorModel]="editorModel.validationErrorModel" [sections]="selectedBlueprint.definition.sections" [viewOnly]="formGroup.disabled || !canEdit"></app-plan-user-field-component>
</div>
</div>
</div>
<div *ngIf="field.category === planBlueprintSectionFieldCategoryEnum.ReferenceType">

69
frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.component.ts
View File

@ -4,7 +4,12 @@ import { FormArray, UntypedFormGroup } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
import { Title } from '@angular/platform-browser';
import { ActivatedRoute, Router } from '@angular/router';
import { AnnotationEntityType } from '@app/core/common/enum/annotation-entity-type';
import { DescriptionStatus } from '@app/core/common/enum/description-status';
import { FileTransformerEntityType } from '@app/core/common/enum/file-transformer-entity-type';
import { IsActive } from '@app/core/common/enum/is-active.enum';
import { LockTargetType } from '@app/core/common/enum/lock-target-type';
import { AppPermission } from '@app/core/common/enum/permission.enum';
import { PlanAccessType } from '@app/core/common/enum/plan-access-type';
import { PlanBlueprintFieldCategory } from '@app/core/common/enum/plan-blueprint-field-category';
import { PlanBlueprintExtraFieldDataType } from '@app/core/common/enum/plan-blueprint-field-type';
@ -13,25 +18,24 @@ import { PlanBlueprintSystemFieldType } from '@app/core/common/enum/plan-bluepri
import { PlanStatus } from '@app/core/common/enum/plan-status';
import { PlanUserRole } from '@app/core/common/enum/plan-user-role';
import { PlanUserType } from '@app/core/common/enum/plan-user-type';
import { IsActive } from '@app/core/common/enum/is-active.enum';
import { LockTargetType } from '@app/core/common/enum/lock-target-type';
import { AppPermission } from '@app/core/common/enum/permission.enum';
import { DescriptionTemplate } from '@app/core/model/description-template/description-template';
import { DescriptionSectionPermissionResolver } from '@app/core/model/description/description';
import { PlanBlueprint, PlanBlueprintDefinitionSection, FieldInSection } from '@app/core/model/plan-blueprint/plan-blueprint';
import { Plan, PlanPersist } from '@app/core/model/plan/plan';
import { LanguageInfo } from '@app/core/model/language-info';
import { FieldInSection, PlanBlueprint, PlanBlueprintDefinitionSection } from '@app/core/model/plan-blueprint/plan-blueprint';
import { Plan, PlanPersist } from '@app/core/model/plan/plan';
import { AuthService } from '@app/core/services/auth/auth.service';
import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
import { LanguageInfoService } from '@app/core/services/culture/language-info-service';
import { DescriptionTemplateService } from '@app/core/services/description-template/description-template.service';
import { DescriptionService } from '@app/core/services/description/description.service';
import { PlanBlueprintService } from '@app/core/services/plan/plan-blueprint.service';
import { PlanService } from '@app/core/services/plan/plan.service';
import { FileTransformerService } from '@app/core/services/file-transformer/file-transformer.service';
import { LockService } from '@app/core/services/lock/lock.service';
import { LoggingService } from '@app/core/services/logging/logging-service';
import { AnalyticsService } from '@app/core/services/matomo/analytics-service';
import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
import { PlanBlueprintService } from '@app/core/services/plan/plan-blueprint.service';
import { PlanService } from '@app/core/services/plan/plan.service';
import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
import { UserService } from '@app/core/services/user/user.service';
import { EnumUtils } from '@app/core/services/utilities/enum-utils.service';
import { QueryParamsService } from '@app/core/services/utilities/query-params.service';
@ -39,6 +43,7 @@ import { MultipleAutoCompleteConfiguration } from '@app/library/auto-complete/mu
import { MultipleAutoCompleteCanRemoveItem } from '@app/library/auto-complete/multiple/multiple-auto-complete.component';
import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration';
import { DescriptionTemplatePreviewDialogComponent } from '@app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component';
import { AnnotationDialogComponent } from '@app/ui/annotations/annotation-dialog-component/annotation-dialog.component';
import { BreadcrumbService } from '@app/ui/misc/breadcrumb/breadcrumb.service';
import { BaseEditor } from '@common/base/base-editor';
import { FormService } from '@common/forms/form-service';
@ -49,13 +54,11 @@ import { Guid } from '@common/types/guid';
import { TranslateService } from '@ngx-translate/core';
import { map, takeUntil } from 'rxjs/operators';
import { PlanContactPrefillDialogComponent } from '../plan-contact-prefill-dialog/plan-contact-prefill-dialog.component';
import { PlanEditorModel, PlanFieldIndicator } from './plan-editor.model';
import { PlanEditorEntityResolver } from './resolvers/plan-editor-enitity.resolver';
import { PlanEditorService } from './plan-editor.service';
import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
import { FileTransformerService } from '@app/core/services/file-transformer/file-transformer.service';
import { FileTransformerEntityType } from '@app/core/common/enum/file-transformer-entity-type';
import { PlanFinalizeDialogComponent, PlanFinalizeDialogOutput } from '../plan-finalize-dialog/plan-finalize-dialog.component';
import { PlanEditorModel, PlanFieldIndicator } from './plan-editor.model';
import { PlanEditorService } from './plan-editor.service';
import { PlanEditorEntityResolver } from './resolvers/plan-editor-enitity.resolver';
import { FormAnnotationService } from '@app/ui/annotations/annotation-dialog-component/form-annotation.service';
@Component({
selector: 'app-plan-editor',
@ -72,6 +75,7 @@ export class PlanEditorComponent extends BaseEditor<PlanEditorModel, Plan> imple
item: Plan;
selectedBlueprint: PlanBlueprint;
step: number = 0;
annotationsPerAnchor: Map<string, number> = new Map<string, number>();
//Enums
descriptionStatusEnum = DescriptionStatus;
@ -147,6 +151,10 @@ export class PlanEditorComponent extends BaseEditor<PlanEditorModel, Plan> imple
return this.isNew ? this.authService.hasPermission(AppPermission.NewPlan) : this.item.authorizationFlags?.some(x => x === AppPermission.EditPlan) || this.authService.hasPermission(AppPermission.EditPlan);
}
protected canAnnotate(id: Guid): boolean {
return this.permissionPerSection && this.permissionPerSection[id.toString()] && this.permissionPerSection[id.toString()].some(x => x === AppPermission.AnnotatePlan);
}
private hasPermission(permission: AppPermission): boolean {
return this.authService.hasPermission(permission) || this.item?.authorizationFlags?.some(x => x === permission) || this.editorModel?.permissions?.includes(permission);
}
@ -180,6 +188,7 @@ export class PlanEditorComponent extends BaseEditor<PlanEditorModel, Plan> imple
private analyticsService: AnalyticsService,
private breadcrumbService: BreadcrumbService,
public fileTransformerService: FileTransformerService,
private formAnnotationService: FormAnnotationService,
) {
const descriptionLabel: string = route.snapshot.data['entity']?.label;
if (descriptionLabel) {
@ -196,6 +205,16 @@ export class PlanEditorComponent extends BaseEditor<PlanEditorModel, Plan> imple
this.permissionPerSection = this.route.snapshot.data['permissions'] as Map<Guid, string[]> ?? new Map<Guid, string[]>();
super.ngOnInit();
if (this.isNew === false && this.step === 0) this.nextStep();
this.formAnnotationService.init(this.item.id, AnnotationEntityType.Plan);
this.formAnnotationService.getAnnotationCountObservable().pipe(takeUntil(this._destroyed)).subscribe((annotationsPerAnchor: Map<string, number>) => {
this.annotationsPerAnchor = annotationsPerAnchor;
});
this.formAnnotationService.getOpenAnnotationSubjectObservable().pipe(takeUntil(this._destroyed)).subscribe((anchorId: string) => {
if (anchorId && anchorId == this.item.id?.toString()) this.showAnnotations(anchorId);
});
}
getItem(itemId: Guid, successFunction: (item: Plan) => void) {
@ -774,6 +793,30 @@ export class PlanEditorComponent extends BaseEditor<PlanEditorModel, Plan> imple
} as MultipleAutoCompleteCanRemoveItem;
}
//
//
// Annotations
//
//
showAnnotations(anchorId: string) {
const dialogRef = this.dialog.open(AnnotationDialogComponent, {
width: '40rem',
maxWidth: '90vw',
maxHeight: '90vh',
data: {
entityId: this.item.id,
anchor: anchorId,
entityType: AnnotationEntityType.Plan,
planUsers: this.item?.planUsers ?? []
}
});
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(changesMade => {
if (changesMade) {
this.formAnnotationService.refreshAnnotations();
}
});
}
//
//
// Misc

4
frontend/src/app/ui/plan/plan-editor-blueprint/plan-editor.module.ts
View File

@ -13,6 +13,7 @@ import { PlanEditorRoutingModule } from './plan-editor.routing';
import { PlanFormProgressIndicationModule } from './form-progress-indication/plan-form-progress-indication.module';
import { PlanDeleteDialogModule } from '../plan-delete-dialog/plan-delete-dialog.module';
import { PlanContactPrefillDialogModule } from '../plan-contact-prefill-dialog/plan-contact-prefill-dialog.module';
import { AnnotationDialogModule } from '@app/ui/annotations/annotation-dialog-component/annotation-dialog.module';
@NgModule({
imports: [
@ -28,7 +29,8 @@ import { PlanContactPrefillDialogModule } from '../plan-contact-prefill-dialog/p
DragDropModule,
PlanUserFieldModule,
PlanFormProgressIndicationModule,
PlanContactPrefillDialogModule
PlanContactPrefillDialogModule,
AnnotationDialogModule
],
declarations: [
PlanEditorComponent,

2
frontend/src/app/ui/plan/plan-editor-blueprint/resolvers/plan-editor-permissions.resolver.ts
View File

@ -34,7 +34,7 @@ export class PlanEditorPermissionsResolver extends BaseEditorResolver {
let descriptionSectionPermissionResolverModel: DescriptionSectionPermissionResolver = {
planId: data.id,
sectionIds: data?.blueprint?.definition?.sections?.map(x => x.id),
permissions: [AppPermission.EditDescription, AppPermission.DeleteDescription]
permissions: [AppPermission.EditDescription, AppPermission.DeleteDescription, AppPermission.AnnotatePlan]
};
return this.descriptionService.getDescriptionSectionPermissions(descriptionSectionPermissionResolverModel).pipe(takeUntil(this._destroyed));
}

3
frontend/src/assets/i18n/baq.json
View File

@ -1735,7 +1735,8 @@
"SAVE-AND-CLOSE": "Save & Close",
"SAVE-AND-CONTINUE": "Save & Continue",
"REVERSE": "Undo Finalization",
"LOCKED": "Locked"
"LOCKED": "Locked",
"ANNOTATIONS": "Comment"
},
"PLACEHOLDER": {
"DESCRIPTION": "Deskribapenarekin bete",

3
frontend/src/assets/i18n/de.json
View File

@ -1735,7 +1735,8 @@
"SAVE-AND-CLOSE": "Save & Close",
"SAVE-AND-CONTINUE": "Save & Continue",
"REVERSE": "Undo Finalization",
"LOCKED": "Locked"
"LOCKED": "Locked",
"ANNOTATIONS": "Comment"
},
"PLACEHOLDER": {
"DESCRIPTION": "Fill with description",

3
frontend/src/assets/i18n/en.json
View File

@ -1735,7 +1735,8 @@
"SAVE-AND-CLOSE": "Save & Close",
"SAVE-AND-CONTINUE": "Save & Continue",
"REVERSE": "Undo Finalization",
"LOCKED": "Locked"
"LOCKED": "Locked",
"ANNOTATIONS": "Comment"
},
"PLACEHOLDER": {
"DESCRIPTION": "Fill with description",

3
frontend/src/assets/i18n/es.json
View File

@ -1735,7 +1735,8 @@
"SAVE-AND-CLOSE": "Save & Close",
"SAVE-AND-CONTINUE": "Save & Continue",
"REVERSE": "Undo Finalization",
"LOCKED": "Locked"
"LOCKED": "Locked",
"ANNOTATIONS": "Comment"
},
"PLACEHOLDER": {
"DESCRIPTION": "Rellenar con la descripción",

3
frontend/src/assets/i18n/gr.json
View File

@ -1735,7 +1735,8 @@
"SAVE-AND-CLOSE": "Save & Close",
"SAVE-AND-CONTINUE": "Save & Continue",
"REVERSE": "Undo Finalization",
"LOCKED": "Locked"
"LOCKED": "Locked",
"ANNOTATIONS": "Comment"
},
"PLACEHOLDER": {
"DESCRIPTION": "Συμπληρώστε με περιγραφή",

3
frontend/src/assets/i18n/hr.json
View File

@ -1735,7 +1735,8 @@
"SAVE-AND-CLOSE": "Save & Close",
"SAVE-AND-CONTINUE": "Save & Continue",
"REVERSE": "Undo Finalization",
"LOCKED": "Locked"
"LOCKED": "Locked",
"ANNOTATIONS": "Comment"
},
"PLACEHOLDER": {
"DESCRIPTION": "Dodajte opis",

3
frontend/src/assets/i18n/pl.json
View File

@ -1735,7 +1735,8 @@
"SAVE-AND-CLOSE": "Save & Close",
"SAVE-AND-CONTINUE": "Save & Continue",
"REVERSE": "Undo Finalization",
"LOCKED": "Locked"
"LOCKED": "Locked",
"ANNOTATIONS": "Comment"
},
"PLACEHOLDER": {
"DESCRIPTION": "Dodaj opis",

3
frontend/src/assets/i18n/pt.json
View File

@ -1735,7 +1735,8 @@
"SAVE-AND-CLOSE": "Save & Close",
"SAVE-AND-CONTINUE": "Save & Continue",
"REVERSE": "Undo Finalization",
"LOCKED": "Locked"
"LOCKED": "Locked",
"ANNOTATIONS": "Comment"
},
"PLACEHOLDER": {
"DESCRIPTION": "Preencha com a descrição",

3
frontend/src/assets/i18n/sk.json
View File

@ -1735,7 +1735,8 @@
"SAVE-AND-CLOSE": "Save & Close",
"SAVE-AND-CONTINUE": "Save & Continue",
"REVERSE": "Undo Finalization",
"LOCKED": "Locked"
"LOCKED": "Locked",
"ANNOTATIONS": "Comment"
},
"PLACEHOLDER": {
"DESCRIPTION": "Doplniť opis",

3
frontend/src/assets/i18n/sr.json
View File

@ -1735,7 +1735,8 @@
"SAVE-AND-CLOSE": "Save & Close",
"SAVE-AND-CONTINUE": "Save & Continue",
"REVERSE": "Undo Finalization",
"LOCKED": "Locked"
"LOCKED": "Locked",
"ANNOTATIONS": "Comment"
},
"PLACEHOLDER": {
"DESCRIPTION": "Dodajte opis",

3
frontend/src/assets/i18n/tr.json
View File

@ -1735,7 +1735,8 @@
"SAVE-AND-CLOSE": "Save & Close",
"SAVE-AND-CONTINUE": "Save & Continue",
"REVERSE": "Undo Finalization",
"LOCKED": "Locked"
"LOCKED": "Locked",
"ANNOTATIONS": "Comment"
},
"PLACEHOLDER": {
"DESCRIPTION": "Açıklamaları Doldur",