From 65579c0b0b085dd00b3833e00bbd4144b3bf045c Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Fri, 13 Sep 2024 12:43:44 +0200
Subject: [PATCH] PR
---
.../document-events-panel.component.html | 2 +-
.../document-events-panel.component.ts | 2 +-
.../document-versions-panel.component.html | 4 ++--
.../document-versions-panel.component.ts | 2 +-
.../review-tasks-panel.component.html | 9 ---------
.../resource-details-panel.component.ts | 15 +++++++++------
6 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.html b/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.html
index 939c5d560..595803b18 100644
--- a/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.html
+++ b/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.html
@@ -14,7 +14,7 @@
mat-sort-header>{{ "document.events.panel.label.date" | translate }}
</th>
<td mat-cell *matCellDef="let row;">
- {{ row.eventOn | date: getDateTimeFormat }}
+ {{ row.eventOn | date: dateTimeFormat }}
</td>
</ng-container>
<ng-container matColumnDef="eventType">
diff --git a/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.ts b/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.ts
index c570f4cd8..c22cc2a62 100644
--- a/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.ts
+++ b/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.ts
@@ -76,7 +76,7 @@ export class DocumentEventsPanelComponent implements AfterViewInit, BeforeLeaveG
private controlContainer: ControlContainer) {
}
- get getDateTimeFormat(): string {
+ get dateTimeFormat(): string {
return this.globalLookups.getDateTimeFormat();
}
diff --git a/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.html b/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.html
index 97f76b59a..7c0778d30 100644
--- a/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.html
+++ b/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.html
@@ -26,7 +26,7 @@
mat-sort-header>{{ "document.versions.panel.label.created" | translate }}
</th>
<td mat-cell *matCellDef="let row;">
- {{ row.createdOn | date: getDateTimeFormat }}
+ {{ row.createdOn | date: dateTimeFormat }}
</ng-container>
<ng-container matColumnDef="lastUpdatedOn">
@@ -34,7 +34,7 @@
mat-sort-header>{{ "document.versions.panel.label.updated" | translate }}
</th>
<td mat-cell *matCellDef="let row;">
- {{ row.lastUpdatedOn | date: getDateTimeFormat }}
+ {{ row.lastUpdatedOn | date: dateTimeFormat }}
</ng-container>
<tr mat-header-row
diff --git a/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.ts b/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.ts
index 38b6161f7..0583a8bfa 100644
--- a/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.ts
+++ b/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.ts
@@ -76,7 +76,7 @@ export class DocumentVersionsPanelComponent implements AfterViewInit, BeforeLeav
private controlContainer: ControlContainer) {
}
- get getDateTimeFormat(): string {
+ get dateTimeFormat(): string {
return this.globalLookups.getDateTimeFormat();
}
diff --git a/smp-angular/src/app/common/panels/review-tasks-panel/review-tasks-panel.component.html b/smp-angular/src/app/common/panels/review-tasks-panel/review-tasks-panel.component.html
index f4e33f08f..3a730ea3b 100644
--- a/smp-angular/src/app/common/panels/review-tasks-panel/review-tasks-panel.component.html
+++ b/smp-angular/src/app/common/panels/review-tasks-panel/review-tasks-panel.component.html
@@ -17,13 +17,4 @@
<ng-template #dateTimeColumn let-value="value" ngx-datatable-cell-template>
<div class='truncate-text' title="{{value | date:dateTimeFormat}}">{{ value | date:dateTimeFormat }}</div>
</ng-template>
- <ng-template #truncateText let-value="value" ngx-datatable-cell-template>
- <div class='truncate-text' title="{{value}}">{{ value }}</div>
- </ng-template>
- <ng-template #forUser let-row="row" let-value="value" ngx-datatable-cell-template>
- <div class='truncate-text' title="{{ 'alert.panel.user.title' | translate: {value, mailTo: row.mailTo} }}">{{ value }}</div>
- </ng-template>
- <ng-template #credentialType let-row="row" let-value="value" ngx-datatable-cell-template>
- <div class='truncate-text'>{{ value['CREDENTIAL_TYPE'] }}</div>
- </ng-template>
</smp-search-table>
diff --git a/smp-angular/src/app/edit/edit-resources/resource-details-panel/resource-details-panel.component.ts b/smp-angular/src/app/edit/edit-resources/resource-details-panel/resource-details-panel.component.ts
index 258a79475..8352877c0 100644
--- a/smp-angular/src/app/edit/edit-resources/resource-details-panel/resource-details-panel.component.ts
+++ b/smp-angular/src/app/edit/edit-resources/resource-details-panel/resource-details-panel.component.ts
@@ -154,13 +154,16 @@ export class ResourceDetailsPanelComponent implements BeforeLeaveGuard {
let updatedResource: ResourceRo = this.resource;
this.editResourceService.updateResourceForGroup(updatedResource, this.group, this.domain).subscribe({
next: (result: ResourceRo): void => {
- if (!!result) {
- this.alertService.successForTranslation("resource.details.panel.alert.resource.saved");
- this.editResourceController.selectedResource = result;
- this._resource = result;
- this.resourceForm.markAsPristine();
+ try {
+ if (!!result) {
+ this.alertService.successForTranslation("resource.details.panel.alert.resource.saved");
+ this.editResourceController.selectedResource = result;
+ this._resource = result;
+ this.resourceForm.markAsPristine();
+ }
+ } finally {
+ this.windowSpinnerService.showSpinner = false;
}
- this.windowSpinnerService.showSpinner = false;
}, error: (err: any): void => {
this.alertService.error(err.error?.errorDescription)
this.windowSpinnerService.showSpinner = false;
--
GitLab