From e6acc6bcc7d374c41e94b9d5f10e65216b080b0e Mon Sep 17 00:00:00 2001
From: "hamza.hramchi" <hamza.hramchi@xelians.fr>
Date: Mon, 26 Oct 2020 16:17:15 +0100
Subject: [PATCH] FEAT #15056 TIME 0:17 make some updates to display highlight
---
src/frontend/app/actions/actions-list.component.html | 4 ++--
src/frontend/app/actions/actions-list.component.ts | 6 ++----
.../folder-action-list/folder-action-list.component.html | 4 ++--
.../folder-action-list/folder-action-list.component.ts | 6 ++----
.../followed-action-list.component.html | 4 ++--
.../followed-action-list/followed-action-list.component.ts | 6 ++----
6 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/frontend/app/actions/actions-list.component.html b/src/frontend/app/actions/actions-list.component.html
index cd499c7878e..52d7eb2ade6 100755
--- a/src/frontend/app/actions/actions-list.component.html
+++ b/src/frontend/app/actions/actions-list.component.html
@@ -27,12 +27,12 @@
<span>{{ 'lang.freezeRetentionRule' | translate }}</span>
</button>
<mat-menu #freezeRentalRule = "matMenu">
- <button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === this.currentResource.resId ? 'isSelectedMenu' : 'notSelectedMenu'}}"
+ <button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === true? 'isSelectedMenu' : 'notSelectedMenu'}}"
[title]="this.translate.instant('lang.freezeTheCurrentUsefulLife')" >
{{ 'lang.freezeTheCurrentUsefulLife' | translate }}
</button>
<mat-divider></mat-divider>
- <button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze !== this.currentResource.resId ? 'isSelectedMenu' : 'notSelectedMenu'}}"
+ <button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze === false ? 'isSelectedMenu' : 'notSelectedMenu'}}"
[title]="this.translate.instant('lang.thawTheCurrentUsefulLife')" >
{{ 'lang.thawTheCurrentUsefulLife' | translate }}
</button>
diff --git a/src/frontend/app/actions/actions-list.component.ts b/src/frontend/app/actions/actions-list.component.ts
index b5791cbe915..a263115812a 100644
--- a/src/frontend/app/actions/actions-list.component.ts
+++ b/src/frontend/app/actions/actions-list.component.ts
@@ -195,10 +195,8 @@ export class ActionsListComponent implements OnInit {
getFreezeBindingValue(id) {
this.http.get(`../rest/resources/${id}?light=true`).pipe(
tap((infos: any) => {
- if (infos.retentionFrozen) {
- this.isSelectedFreeze = id;
- }
- this.isSelectedBinding = infos.binding;
+ this.isSelectedFreeze = infos.retentionFrozen;
+ this.isSelectedBinding = infos.binding;
}),
catchError((err: any) => {
this.notify.handleErrors(err);
diff --git a/src/frontend/app/folder/folder-action-list/folder-action-list.component.html b/src/frontend/app/folder/folder-action-list/folder-action-list.component.html
index f97eefe7d46..32976c692a2 100755
--- a/src/frontend/app/folder/folder-action-list/folder-action-list.component.html
+++ b/src/frontend/app/folder/folder-action-list/folder-action-list.component.html
@@ -43,12 +43,12 @@
<span>{{ 'lang.freezeRetentionRule' | translate }}</span>
</button>
<mat-menu #freezeRentalRule = "matMenu" ng-switch="getValue(var)">
- <button mat-menu-item (click)="toggleFreezing(true)"
+ <button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === true ? 'isSelectedMenu' : 'notSelectedMenu'}}"
[title]="this.translate.instant('lang.freezeTheCurrentUsefulLife')" >
{{ 'lang.freezeTheCurrentUsefulLife' | translate }}
</button>
<mat-divider></mat-divider>
- <button mat-menu-item (click)="toggleFreezing(false)"
+ <button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze === false ? 'isSelectedMenu' : 'notSelectedMenu'}}"
[title]="this.translate.instant('lang.thawTheCurrentUsefulLife')" >
{{ 'lang.thawTheCurrentUsefulLife' | translate }}
</button>
diff --git a/src/frontend/app/folder/folder-action-list/folder-action-list.component.ts b/src/frontend/app/folder/folder-action-list/folder-action-list.component.ts
index bbf61f4889a..f4e2c12e792 100644
--- a/src/frontend/app/folder/folder-action-list/folder-action-list.component.ts
+++ b/src/frontend/app/folder/folder-action-list/folder-action-list.component.ts
@@ -192,10 +192,8 @@ export class FolderActionListComponent implements OnInit {
getFreezeBindingValue(id) {
this.http.get(`../rest/resources/${id}?light=true`).pipe(
tap((infos: any) => {
- if (infos.retentionFrozen) {
- this.isSelectedFreeze = id;
- }
- this.isSelectedBinding = infos.binding;
+ this.isSelectedFreeze = infos.retentionFrozen;
+ this.isSelectedBinding = infos.binding;
}),
catchError((err: any) => {
this.notify.handleErrors(err);
diff --git a/src/frontend/app/home/followed-action-list/followed-action-list.component.html b/src/frontend/app/home/followed-action-list/followed-action-list.component.html
index b4e378a51e6..2eb7a6fe294 100755
--- a/src/frontend/app/home/followed-action-list/followed-action-list.component.html
+++ b/src/frontend/app/home/followed-action-list/followed-action-list.component.html
@@ -39,12 +39,12 @@
<span>{{ 'lang.freezeRetentionRule' | translate }}</span>
</button>
<mat-menu #freezeRentalRule = "matMenu">
- <button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === this.currentResource.resId ? 'isSelectedMenu' : 'notSelectedMenu'}}"
+ <button mat-menu-item (click)="toggleFreezing(true)" class="{{this.isSelectedFreeze === true ? 'isSelectedMenu' : 'notSelectedMenu'}}"
[title]="this.translate.instant('lang.freezeTheCurrentUsefulLife')" >
{{ 'lang.freezeTheCurrentUsefulLife' | translate }}
</button>
<mat-divider></mat-divider>
- <button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze !== this.currentResource.resId ? 'isSelectedMenu' : 'notSelectedMenu'}}"
+ <button mat-menu-item (click)="toggleFreezing(false)" class="{{this.isSelectedFreeze === false ? 'isSelectedMenu' : 'notSelectedMenu'}}"
[title]="this.translate.instant('lang.thawTheCurrentUsefulLife')" >
{{ 'lang.thawTheCurrentUsefulLife' | translate }}
</button>
diff --git a/src/frontend/app/home/followed-action-list/followed-action-list.component.ts b/src/frontend/app/home/followed-action-list/followed-action-list.component.ts
index 097af5fe340..fd4d09335d5 100644
--- a/src/frontend/app/home/followed-action-list/followed-action-list.component.ts
+++ b/src/frontend/app/home/followed-action-list/followed-action-list.component.ts
@@ -177,10 +177,8 @@ export class FollowedActionListComponent implements OnInit {
getFreezeBindingValue(id) {
this.http.get(`../rest/resources/${id}?light=true`).pipe(
tap((infos: any) => {
- if (infos.retentionFrozen) {
- this.isSelectedFreeze = id;
- }
- this.isSelectedBinding = infos.binding;
+ this.isSelectedFreeze = infos.retentionFrozen;
+ this.isSelectedBinding = infos.binding;
}),
catchError((err: any) => {
this.notify.handleErrors(err);
--
GitLab