FEAT #12071 TIME 0:45 front entities restriction + fix entities list + default entities restriction

src/frontend/app/notes/note-editor.component.html

+<div style="overflow: auto;max-height: 75px;">
+    <ng-container *ngFor="let entity of entities | sortBy: 'entity_label';let i=index;">
+        <span *ngIf="entitiesRestriction.indexOf(entity.id) > -1" class="label label-default noteRestriction"
+            (click)="removeEntityRestriction(entitiesRestriction.indexOf(entity.id), i)"
+            title="{{lang.restrictedEntity}}"><i class="fa fa-sitemap"></i>
+            {{entity.entity_label}}&nbsp;<i class="fa fa-times" style="cursor: pointer;"></i></span>
+    </ng-container>
+</div>
 <mat-form-field appearance="outline" class="noteEditorContent">
     <textarea matInput placeholder="{{title}}" [(ngModel)]="content"></textarea>
     <button matSuffix color="primary" mat-icon-button title="{{lang.options}}" [matMenuTriggerFor]="menuMain">
@@ -31,7 +39,7 @@
             {{lang.entities}}
         </div>
         <button mat-menu-item *ngFor="let entity of entities" [disabled]="entity.selected" [title]="entity.entity_label"
-            (click)="selectEntity(entity)">
+            (click)="$event.stopPropagation();selectEntity(entity)">
             <span>{{entity.entity_label}}</span>
         </button>
     </mat-menu>
@@ -44,11 +52,4 @@
         [disabled]="content.trim() == '' || loading">
         <mat-icon fontSet="far" fontIcon="fa-paper-plane fa-2x"></mat-icon>
     </button>
-</mat-form-field>
-<div>
-    <ng-container *ngFor="let entity of entities | sortBy: 'entity_label';let i=index;">
-        <span *ngIf="entitiesRestriction.indexOf(entity.id) > -1" class="label label-default noteRestriction"
-            title="{{lang.restrictedEntity}}"><i class="fa fa-sitemap"></i>
-            {{entity.entity_label}}&nbsp;<i class="fa fa-times" style="cursor: pointer;" (click)="removeEntityRestriction(entitiesRestriction.indexOf(entity.id), i)"></i></span>
-    </ng-container>
-</div>
\ No newline at end of file
+</mat-form-field>
\ No newline at end of file

src/frontend/app/notes/note-editor.component.scss

@@ -24,4 +24,5 @@
     white-space: normal;
     display: inline-block;
     margin: 5px !important;
+    cursor: pointer;
 }
\ No newline at end of file

src/frontend/app/notes/note-editor.component.ts

-import { Component, AfterViewInit, Input, EventEmitter, Output } from '@angular/core';
+import { Component, Input, EventEmitter, Output, OnInit } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { LANG } from '../translate.component';
 import { NotificationService } from '../notification.service';
+import { catchError, tap } from 'rxjs/operators';
+import { HeaderService } from '../../service/header.service';
+import { of } from 'rxjs';
 
 @Component({
     selector: 'app-note-editor',
@@ -9,7 +12,7 @@ import { NotificationService } from '../notification.service';
     styleUrls: ['note-editor.component.scss'],
     providers: [NotificationService]
 })
-export class NoteEditorComponent implements AfterViewInit {
+export class NoteEditorComponent implements OnInit {
 
     lang: any = LANG;
     notes: any;
@@ -27,24 +30,49 @@ export class NoteEditorComponent implements AfterViewInit {
     @Input('noteContent') noteContent: string;
     @Input('entitiesNoteRestriction') entitiesNoteRestriction: string[];
     @Input('noteId') noteId: number;
+    @Input('defaultRestriction') defaultRestriction: boolean;
     @Output('refreshNotes') refreshNotes = new EventEmitter<string>();
 
-    constructor(public http: HttpClient) { }
+    constructor(
+        public http: HttpClient,
+        private notify: NotificationService,
+        public headerService: HeaderService) { }
+
+    async ngOnInit() {
+        await this.getEntities();
+
+        if (this.defaultRestriction) {
+            this.setDefaultRestriction();
+        }
 
-    ngOnInit() {
-        this.getEntities();
         if (this.upMode) {
             this.content = this.noteContent;
             this.entitiesRestriction = this.entitiesNoteRestriction;
         }
     }
 
-    ngAfterViewInit() {
+    setDefaultRestriction() {
+        this.entitiesRestriction = [];
+        this.http.get(`../../rest/resources/${this.resIds[0]}?light=true`).pipe(
+            tap((data: any) => {
+                this.entitiesRestriction = this.headerService.user.entities.map((entity: any) => entity.entity_id);
+                this.entities.filter((entity: any) => this.entitiesRestriction.indexOf(entity.id) > -1).forEach((element: any) => {
+                    element.selected = true;
+                });
+                if (this.entitiesRestriction.indexOf(data.destination) === -1) {
+                    this.entitiesRestriction.push(data.destination);
+                }
+            }),
+            catchError((err: any) => {
+                this.notify.handleSoftErrors(err);
+                return of(false);
+            })
+        ).subscribe();
     }
 
     addNote() {
         this.loading = true;
-        this.http.post("../../rest/notes", { value: this.content, resId: this.resIds[0], entities : this.entitiesRestriction })
+        this.http.post("../../rest/notes", { value: this.content, resId: this.resIds[0], entities: this.entitiesRestriction })
             .subscribe((data: any) => {
                 this.refreshNotes.emit(this.resIds[0]);
                 this.loading = false;
@@ -53,7 +81,7 @@ export class NoteEditorComponent implements AfterViewInit {
 
     updateNote() {
         this.loading = true;
-        this.http.put("../../rest/notes/" + this.noteId, { value: this.content, resId: this.resIds[0], entities : this.entitiesRestriction })
+        this.http.put("../../rest/notes/" + this.noteId, { value: this.content, resId: this.resIds[0], entities: this.entitiesRestriction })
             .subscribe((data: any) => {
                 this.refreshNotes.emit(this.resIds[0]);
                 this.loading = false;
@@ -74,7 +102,7 @@ export class NoteEditorComponent implements AfterViewInit {
 
     selectEntity(entity: any) {
         entity.selected = true;
-       this.entitiesRestriction.push(entity.id);
+        this.entitiesRestriction.push(entity.id);
     }
 
     getTemplatesNote() {
@@ -92,21 +120,30 @@ export class NoteEditorComponent implements AfterViewInit {
     }
 
     getEntities() {
-        if (this.entities.length == 0) {
-            let params = {};
-            if (this.resIds.length == 1) {
-                params['resId'] = this.resIds[0];
-            }
-            this.http.get("../../rest/entities")
-                .subscribe((data: any) => {
-                    this.entities = data['entities'];
-                });
+        return new Promise((resolve, reject) => {
+            if (this.entities.length == 0) {
+                let params = {};
+                if (this.resIds.length == 1) {
+                    params['resId'] = this.resIds[0];
+                }
+                this.http.get("../../rest/entities").pipe(
+                    tap((data: any) => {
+                        this.entities = data['entities'];
+                        resolve(true);
+                    }),
+                    catchError((err: any) => {
+                        this.notify.handleSoftErrors(err);
+                        resolve(false);
+                        return of(false);
+                    })
+                ).subscribe();
 
-        }
+            }
+        });
     }
 
     removeEntityRestriction(index: number, realIndex: number) {
         this.entities[realIndex].selected = false;
-        this.entitiesRestriction.splice(index,1);
+        this.entitiesRestriction.splice(index, 1);
     }
 }

src/frontend/app/notes/notes-list.component.html

@@ -2,7 +2,7 @@
     <mat-spinner style="margin:auto;"></mat-spinner>
 </div>
 <ng-container *ngIf="!loading">
-    <app-note-editor *ngIf="editMode" #noteEditor [addMode]="true" [resIds]="resIds" (refreshNotes)="loadNotes($event)" style="margin: 20px;display: flex;flex-direction: column;"></app-note-editor>
+    <app-note-editor *ngIf="editMode" #noteEditor [addMode]="true" [resIds]="resIds"  [defaultRestriction]="true" (refreshNotes)="loadNotes($event)" style="margin: 20px;display: flex;flex-direction: column;"></app-note-editor>
     <div *ngIf="notes.length == 0" style="text-align:center;font-size:24px;font-weight:bold;opacity:0.3;">
         {{lang.noNote}}
     </div>

src/frontend/app/notes/notes.component.ts

@@ -19,7 +19,7 @@ export class NotesListComponent implements OnInit {
 
     lang: any = LANG;
     notes: any[] = [];
-    loading: boolean = false;
+    loading: boolean = true;
     resIds : number[] = [];
 
     @Input('injectDatas') injectDatas: any;