From 9500e9112fa042402e16c6e6c12edfbc0a724922 Mon Sep 17 00:00:00 2001
From: EL HAJJIOUI Nabil <nabil.elhajjioui@smile.fr>
Date: Wed, 30 Sep 2020 16:30:20 +0200
Subject: [PATCH] Rename API Supervision to Logbook Operation
---
.../commons/api/domain/ServicesData.java | 22 ++++++------
.../mongod/1.0.0/101_iam_system_demo.js | 2 +-
.../scripts/mongod/1.0.0/207_iam_ref.js.j2 | 16 ++++-----
.../mongod/1.0.0/208_application_ref.js.j2 | 8 ++---
.../mongod/1.0.0/210_security_ref.js.j2 | 2 +-
.../referential/src/app/app-routing.module.ts | 8 ++---
.../event-filter.interface.ts | 0
.../logbook-operation-detail.component.html} | 2 +-
.../logbook-operation-detail.component.scss} | 0
...ogbook-operation-detail.component.spec.ts} | 16 ++++-----
.../logbook-operation-detail.component.ts} | 12 +++----
.../logbook-operation-popup.component.ts} | 8 ++---
.../event-type-badge-class.pipe.spec.ts | 0
.../event-type-badge-class.pipe.ts | 0
.../event-type-color-class.pipe.spec.ts | 0
.../event-type-color-class.pipe.ts | 0
.../last-event.pipe.spec.ts | 0
.../last-event.pipe.ts | 0
.../logbook-operation-list.component.html} | 2 +-
.../logbook-operation-list.component.scss} | 0
.../logbook-operation-list.component.spec.ts} | 12 +++----
.../logbook-operation-list.component.ts} | 8 ++---
.../logbook-operation-routing.module.ts} | 8 ++---
.../logbook-operation.component.html} | 8 ++---
.../logbook-operation.component.scss} | 0
.../logbook-operation.component.spec.ts} | 16 ++++-----
.../logbook-operation.component.ts} | 14 ++++----
.../logbook-operation.module.ts} | 34 +++++++++----------
.../logbook-search.service.spec.ts | 0
.../logbook-search.service.ts | 2 +-
30 files changed, 100 insertions(+), 100 deletions(-)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api => logbook-operation}/event-filter.interface.ts (100%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-detail/api-supervision-detail.component.html => logbook-operation/logbook-operation-detail/logbook-operation-detail.component.html} (96%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-detail/api-supervision-detail.component.scss => logbook-operation/logbook-operation-detail/logbook-operation-detail.component.scss} (100%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-detail/api-supervision-detail.component.spec.ts => logbook-operation/logbook-operation-detail/logbook-operation-detail.component.spec.ts} (81%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-detail/api-supervision-detail.component.ts => logbook-operation/logbook-operation-detail/logbook-operation-detail.component.ts} (90%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-detail/api-supervision-popup.component.ts => logbook-operation/logbook-operation-detail/logbook-operation-popup.component.ts} (93%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-list => logbook-operation/logbook-operation-list}/event-type-badge-class.pipe.spec.ts (100%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-list => logbook-operation/logbook-operation-list}/event-type-badge-class.pipe.ts (100%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-list => logbook-operation/logbook-operation-list}/event-type-color-class.pipe.spec.ts (100%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-list => logbook-operation/logbook-operation-list}/event-type-color-class.pipe.ts (100%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-list => logbook-operation/logbook-operation-list}/last-event.pipe.spec.ts (100%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-list => logbook-operation/logbook-operation-list}/last-event.pipe.ts (100%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-list/api-supervision-list.component.html => logbook-operation/logbook-operation-list/logbook-operation-list.component.html} (96%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-list/api-supervision-list.component.scss => logbook-operation/logbook-operation-list/logbook-operation-list.component.scss} (100%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-list/api-supervision-list.component.spec.ts => logbook-operation/logbook-operation-list/logbook-operation-list.component.spec.ts} (86%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-list/api-supervision-list.component.ts => logbook-operation/logbook-operation-list/logbook-operation-list.component.ts} (92%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision-routing.module.ts => logbook-operation/logbook-operation-routing.module.ts} (90%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision.component.html => logbook-operation/logbook-operation.component.html} (90%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision.component.scss => logbook-operation/logbook-operation.component.scss} (100%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision.component.spec.ts => logbook-operation/logbook-operation.component.spec.ts} (88%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision.component.ts => logbook-operation/logbook-operation.component.ts} (88%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api/api-supervision.module.ts => logbook-operation/logbook-operation.module.ts} (69%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api => logbook-operation}/logbook-search.service.spec.ts (100%)
rename ui/ui-frontend/projects/referential/src/app/{supervision-api => logbook-operation}/logbook-search.service.ts (100%)
diff --git a/commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/domain/ServicesData.java b/commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/domain/ServicesData.java
index 827cf362..b17b90ad 100644
--- a/commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/domain/ServicesData.java
+++ b/commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/domain/ServicesData.java
@@ -326,13 +326,13 @@ public class ServicesData {
public static final String ROLE_GET_ARCHIVE_PROFILES = ROLE_PREFIX + "GET_ARCHIVE_PROFILES";
- //------------------------------------ API SUPERVISION -----------------------------------------
+ //------------------------------------ API LOGBOOK OPERATION -----------------------------------------
- public static final String SERVICE_API_SUPERVISION_ROLE = "SUPERVISION_API";
+ public static final String SERVICE_API_LOGBOOK_OPERATION_ROLE = "LOGBOOK_OPERATION_API";
- public static final String ROLE_CREATE_SUPERVISION_ROLE = CREATE_ROLE_PREFIX + SERVICE_API_SUPERVISION_ROLE;
- public static final String ROLE_GET_SUPERVISION_ROLE = GET_ROLE_PREFIX + SERVICE_API_SUPERVISION_ROLE;
- public static final String ROLE_GET_ALL_SUPERVISION_ROLE = GET_ROLE_PREFIX + "ALL_" + SERVICE_API_SUPERVISION_ROLE;
+ public static final String ROLE_CREATE_LOGBOOK_OPERATION_ROLE = CREATE_ROLE_PREFIX + SERVICE_API_LOGBOOK_OPERATION_ROLE;
+ public static final String ROLE_GET_LOGBOOK_OPERATION_ROLE = GET_ROLE_PREFIX + SERVICE_API_LOGBOOK_OPERATION_ROLE;
+ public static final String ROLE_GET_ALL_LOGBOOK_OPERATION_ROLE = GET_ROLE_PREFIX + "ALL_" + SERVICE_API_LOGBOOK_OPERATION_ROLE;
//@formatter:off
@@ -414,9 +414,9 @@ public class ServicesData {
ROLE_GET_OPERATIONS,
ROLE_RUN_PROBATIVE_VALUE,
- ROLE_CREATE_SUPERVISION_ROLE,
- ROLE_GET_SUPERVISION_ROLE,
- ROLE_GET_ALL_SUPERVISION_ROLE
+ ROLE_CREATE_LOGBOOK_OPERATION_ROLE,
+ ROLE_GET_LOGBOOK_OPERATION_ROLE,
+ ROLE_GET_ALL_LOGBOOK_OPERATION_ROLE
);
@@ -521,9 +521,9 @@ public class ServicesData {
ROLE_RUN_AUDITS,
ROLE_RUN_PROBATIVE_VALUE,
- ROLE_CREATE_SUPERVISION_ROLE,
- ROLE_GET_SUPERVISION_ROLE,
- ROLE_GET_ALL_SUPERVISION_ROLE
+ ROLE_CREATE_LOGBOOK_OPERATION_ROLE,
+ ROLE_GET_LOGBOOK_OPERATION_ROLE,
+ ROLE_GET_ALL_LOGBOOK_OPERATION_ROLE
);
//@formatter:on
diff --git a/deployment/scripts/mongod/1.0.0/101_iam_system_demo.js b/deployment/scripts/mongod/1.0.0/101_iam_system_demo.js
index 850f4e85..4b9c5688 100644
--- a/deployment/scripts/mongod/1.0.0/101_iam_system_demo.js
+++ b/deployment/scripts/mongod/1.0.0/101_iam_system_demo.js
@@ -200,7 +200,7 @@ db.groups.insert({
"system_secure",
"system_dsl",
"system_probative_value",
- "system_supervision_api_profile"
+ "system_logbook_operation_profile"
],
"readonly": false,
"level": "",
diff --git a/deployment/scripts/mongod/1.0.0/207_iam_ref.js.j2 b/deployment/scripts/mongod/1.0.0/207_iam_ref.js.j2
index 0f9a3c06..5843cb49 100644
--- a/deployment/scripts/mongod/1.0.0/207_iam_ref.js.j2
+++ b/deployment/scripts/mongod/1.0.0/207_iam_ref.js.j2
@@ -408,25 +408,25 @@ db.profiles.insert({
});
db.profiles.insert({
- "_id": "system_supervision_api_profile",
+ "_id": "system_logbook_operation_profile",
"identifier" : NumberInt(maxIdProfile++),
- "name": "Supervision API Profile",
- "description": "Supervision Profile api",
+ "name": "Journal des Opérations",
+ "description": "Logbook Operation Profile api",
"tenantIdentifier": NumberInt({{ vitamui_platform_informations.proof_tenant }}),
- "applicationName": "SUPERVISION_API_APP",
+ "applicationName": "LOGBOOK_OPERATION_APP",
"level": "",
"enabled": true,
"readonly": false,
"customerId": "system_customer",
"roles": [
{
- "name": "ROLE_CREATE_SUPERVISION_API"
+ "name": "ROLE_CREATE_LOGBOOK_OPERATION_API"
},
{
- "name": "ROLE_GET_SUPERVISION_API"
+ "name": "ROLE_GET_LOGBOOK_OPERATION_API"
},
{
- "name": "ROLE_GET_ALL_SUPERVISION_API"
+ "name": "ROLE_GET_ALL_LOGBOOK_OPERATION_API"
},
{
"name": "ROLE_LOGBOOKS"
@@ -464,7 +464,7 @@ db.groups.updateOne( {
"system_secure",
"system_dsl",
"system_probative_value",
- "system_supervision_api_profile"
+ "system_logbook_operation_profile"
]
}
}
diff --git a/deployment/scripts/mongod/1.0.0/208_application_ref.js.j2 b/deployment/scripts/mongod/1.0.0/208_application_ref.js.j2
index 03bba5a2..e1fef1ca 100644
--- a/deployment/scripts/mongod/1.0.0/208_application_ref.js.j2
+++ b/deployment/scripts/mongod/1.0.0/208_application_ref.js.j2
@@ -203,14 +203,14 @@ db.applications.insert({
});
db.applications.insert({
- "identifier" : "SUPERVISION_API_APP",
+ "identifier" : "LOGBOOK_OPERATION_APP",
{% if vitamui.referential.base_url is defined %}
- "url": "{{ vitamui.referential.base_url }}/supervision-api",
+ "url": "{{ vitamui.referential.base_url }}/logbook-operation",
{% else %}
- "url": "{{ url_prefix }}/referential/supervision-api",
+ "url": "{{ url_prefix }}/referential/logbook-operation",
{% endif %}
"icon": "vitamui-icon vitamui-icon-api-supervision",
- "name": "Supervision des APIs",
+ "name": "Journal des Opérations",
"category": "referential",
"position": NumberInt(16),
"hasCustomerList": false,
diff --git a/deployment/scripts/mongod/1.0.0/210_security_ref.js.j2 b/deployment/scripts/mongod/1.0.0/210_security_ref.js.j2
index 10e7c5fd..906a74f6 100644
--- a/deployment/scripts/mongod/1.0.0/210_security_ref.js.j2
+++ b/deployment/scripts/mongod/1.0.0/210_security_ref.js.j2
@@ -25,7 +25,7 @@ db.contexts.insert({
"ROLE_GET_CONTEXTS", "ROLE_UPDATE_CONTEXTS", "ROLE_CREATE_CONTEXTS",
"ROLE_GET_SECURITY_PROFILES", "ROLE_UPDATE_SECURITY_PROFILES", "ROLE_CREATE_SECURITY_PROFILES", "ROLE_DELETE_SECURITY_PROFILES",
"ROLE_GET_OPERATIONS", "ROLE_RUN_AUDITS", "ROLE_RUN_PROBATIVE_VALUE",
- "ROLE_CREATE_SUPERVISION_API", "ROLE_GET_SUPERVISION_API", "ROLE_GET_ALL_SUPERVISION_API", "ROLE_LOGBOOKS"
+ "ROLE_CREATE_LOGBOOK_OPERATION_API", "ROLE_GET_LOGBOOK_OPERATION_API", "ROLE_GET_ALL_LOGBOOK_OPERATION_API", "ROLE_LOGBOOKS"
]
});
diff --git a/ui/ui-frontend/projects/referential/src/app/app-routing.module.ts b/ui/ui-frontend/projects/referential/src/app/app-routing.module.ts
index b1ac9e59..9d87eef8 100644
--- a/ui/ui-frontend/projects/referential/src/app/app-routing.module.ts
+++ b/ui/ui-frontend/projects/referential/src/app/app-routing.module.ts
@@ -111,13 +111,13 @@ const routes: Routes = [
data: {appId: 'PROBATIVE_VALUE_APP'}
},
// =====================================================
- // SUPERVISION API
+ // LOGBOOK OPERATION API
// =====================================================
{
- path: 'supervision-api',
- loadChildren: () => import('./supervision-api/api-supervision.module').then(m => m.ApiSupervisionModule),
+ path: 'logbook-operation',
+ loadChildren: () => import('./logbook-operation/logbook-operation.module').then(m => m.LogbookOperationModule),
canActivate: [AuthGuard, AppGuard],
- data: { appId: 'SUPERVISION_API_APP' }
+ data: { appId: 'LOGBOOK_OPERATION_APP' }
},
// =====================================================
// DSL
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/event-filter.interface.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/event-filter.interface.ts
similarity index 100%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/event-filter.interface.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/event-filter.interface.ts
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-detail.component.html b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-detail.component.html
similarity index 96%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-detail.component.html
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-detail.component.html
index 4ea07567..0e0d345f 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-detail.component.html
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-detail.component.html
@@ -8,7 +8,7 @@
<div class="header-container">
<div class="title">
<div class="status-badge-mini" [ngClass]="event | eventTypeBadgeClass">
- <i class="vitamui-icon vitamui-icon-box-hand no-margin"></i>
+ <i class="vitamui-icon vitamui-icon-api-supervision vitamui-row-icon status-badge"></i>
</div>
<h2>{{ event?.id }}</h2>
</div>
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-detail.component.scss b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-detail.component.scss
similarity index 100%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-detail.component.scss
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-detail.component.scss
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-detail.component.spec.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-detail.component.spec.ts
similarity index 81%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-detail.component.spec.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-detail.component.spec.ts
index 99694f35..cbf4fdae 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-detail.component.spec.ts
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-detail.component.spec.ts
@@ -40,17 +40,17 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute } from '@angular/router';
-import { EventTypeBadgeClassPipe } from '../api-supervision-list/event-type-badge-class.pipe';
-import { LastEventPipe } from '../api-supervision-list/last-event.pipe';
-import { ApiSupervisionDetailComponent } from './api-supervision-detail.component';
+import { EventTypeBadgeClassPipe } from '../logbook-operation-list/event-type-badge-class.pipe';
+import { LastEventPipe } from '../logbook-operation-list/last-event.pipe';
+import { LogbookOperationDetailComponent } from './logbook-operation-detail.component';
-describe('ApiSupervisionDetailComponent', () => {
- let component: ApiSupervisionDetailComponent;
- let fixture: ComponentFixture<ApiSupervisionDetailComponent>;
+describe('LogbookOperationDetailComponent', () => {
+ let component: LogbookOperationDetailComponent;
+ let fixture: ComponentFixture<LogbookOperationDetailComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ ApiSupervisionDetailComponent, EventTypeBadgeClassPipe, LastEventPipe ],
+ declarations: [LogbookOperationDetailComponent, EventTypeBadgeClassPipe, LastEventPipe ],
providers: [
{ provide: LogbookService, useValue: {} },
{ provide: AuthService, useValue: {} },
@@ -62,7 +62,7 @@ describe('ApiSupervisionDetailComponent', () => {
}));
beforeEach(() => {
- fixture = TestBed.createComponent(ApiSupervisionDetailComponent);
+ fixture = TestBed.createComponent(LogbookOperationDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-detail.component.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-detail.component.ts
similarity index 90%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-detail.component.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-detail.component.ts
index 8c21b4dc..0e456799 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-detail.component.ts
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-detail.component.ts
@@ -34,16 +34,16 @@
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL-C license and that you accept its terms.
*/
+import { animate, style, transition, trigger } from '@angular/animations';
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
-import { trigger, style, transition, animate } from '@angular/animations';
import { AuthService, Event, LogbookService } from 'ui-frontend-common';
@Component({
- selector: 'app-api-supervision-detail',
- templateUrl: './api-supervision-detail.component.html',
- styleUrls: ['./api-supervision-detail.component.scss'],
+ selector: 'app-logbook-operation-detail',
+ templateUrl: './logbook-operation-detail.component.html',
+ styleUrls: ['./logbook-operation-detail.component.scss'],
animations: [
trigger('fadeInOut', [
transition(':enter', [
@@ -57,7 +57,7 @@ import { AuthService, Event, LogbookService } from 'ui-frontend-common';
])
]
})
-export class ApiSupervisionDetailComponent implements OnInit, OnChanges {
+export class LogbookOperationDetailComponent implements OnInit, OnChanges {
@Input() eventId: string;
@@ -82,7 +82,7 @@ export class ApiSupervisionDetailComponent implements OnInit, OnChanges {
}
openPopup() {
- window.open('/api-supervision/tenant/' + this.tenantIdentifier + '/event/' + this.event.id,
+ window.open('/logbook-operation/tenant/' + this.tenantIdentifier + '/event/' + this.event.id,
'detailPopup', 'width=584, height=713, resizable=no, location=no');
this.emitClose();
}
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-popup.component.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-popup.component.ts
similarity index 93%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-popup.component.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-popup.component.ts
index 57c281ed..f9bdb24c 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-detail/api-supervision-popup.component.ts
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-detail/logbook-operation-popup.component.ts
@@ -38,17 +38,17 @@ import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
@Component({
- selector: 'app-api-supervision-popup',
+ selector: 'app-logbook-operation-popup',
template: `
- <app-api-supervision-detail
+ <app-logbook-operation-detail
(closePanel)="closePopup()"
[eventId]="eventId"
[tenantIdentifier]="tenantIdentifier"
[isPopup]="true"
- ></app-api-supervision-detail>
+ ></app-logbook-operation-detail>
`
})
-export class ApiSupervisionPopupComponent implements OnInit {
+export class LogbookOperationPopupComponent implements OnInit {
eventId: string;
tenantIdentifier: number;
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/event-type-badge-class.pipe.spec.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/event-type-badge-class.pipe.spec.ts
similarity index 100%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/event-type-badge-class.pipe.spec.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/event-type-badge-class.pipe.spec.ts
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/event-type-badge-class.pipe.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/event-type-badge-class.pipe.ts
similarity index 100%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/event-type-badge-class.pipe.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/event-type-badge-class.pipe.ts
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/event-type-color-class.pipe.spec.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/event-type-color-class.pipe.spec.ts
similarity index 100%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/event-type-color-class.pipe.spec.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/event-type-color-class.pipe.spec.ts
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/event-type-color-class.pipe.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/event-type-color-class.pipe.ts
similarity index 100%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/event-type-color-class.pipe.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/event-type-color-class.pipe.ts
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/last-event.pipe.spec.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/last-event.pipe.spec.ts
similarity index 100%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/last-event.pipe.spec.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/last-event.pipe.spec.ts
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/last-event.pipe.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/last-event.pipe.ts
similarity index 100%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/last-event.pipe.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/last-event.pipe.ts
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/api-supervision-list.component.html b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.html
similarity index 96%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/api-supervision-list.component.html
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.html
index 008526d3..334e844c 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/api-supervision-list.component.html
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.html
@@ -48,7 +48,7 @@
<td style="width:60px;" class="no-first-cell-padding">
<div class="vitamui-cell-icon aligned">
<div class="status-badge" [ngClass]="event | eventTypeBadgeClass">
- <i class="vitamui-icon vitamui-icon-ingest vitamui-row-icon status-badge"></i>
+ <i class="vitamui-icon vitamui-icon-api-supervision vitamui-row-icon status-badge"></i>
</div>
</div>
</td>
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/api-supervision-list.component.scss b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.scss
similarity index 100%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/api-supervision-list.component.scss
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.scss
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/api-supervision-list.component.spec.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.spec.ts
similarity index 86%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/api-supervision-list.component.spec.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.spec.ts
index 10d14148..742a75d9 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/api-supervision-list.component.spec.ts
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.spec.ts
@@ -40,18 +40,18 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { LogbookSearchService } from '../logbook-search.service';
-import { ApiSupervisionListComponent } from './api-supervision-list.component';
import { EventTypeBadgeClassPipe } from './event-type-badge-class.pipe';
import { EventTypeColorClassPipe } from './event-type-color-class.pipe';
import { LastEventPipe } from './last-event.pipe';
+import { LogbookOperationListComponent } from './logbook-operation-list.component';
-describe('ApiSupervisionListComponent', () => {
- let component: ApiSupervisionListComponent;
- let fixture: ComponentFixture<ApiSupervisionListComponent>;
+describe('LogbookOperationListComponent', () => {
+ let component: LogbookOperationListComponent;
+ let fixture: ComponentFixture<LogbookOperationListComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ ApiSupervisionListComponent, LastEventPipe, EventTypeColorClassPipe, EventTypeBadgeClassPipe ],
+ declarations: [LogbookOperationListComponent, LastEventPipe, EventTypeColorClassPipe, EventTypeBadgeClassPipe ],
providers: [
{ provide: LogbookSearchService, useValue: { search: () => EMPTY } },
],
@@ -61,7 +61,7 @@ describe('ApiSupervisionListComponent', () => {
}));
beforeEach(() => {
- fixture = TestBed.createComponent(ApiSupervisionListComponent);
+ fixture = TestBed.createComponent(LogbookOperationListComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/api-supervision-list.component.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.ts
similarity index 92%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/api-supervision-list.component.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.ts
index 199a7e3c..5f64ca2c 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-list/api-supervision-list.component.ts
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.ts
@@ -44,11 +44,11 @@ import { EventFilter } from '../event-filter.interface';
import { LogbookSearchService } from '../logbook-search.service';
@Component({
- selector: 'app-api-supervision-list',
- templateUrl: './api-supervision-list.component.html',
- styleUrls: ['./api-supervision-list.component.scss']
+ selector: 'app-logbook-operation-list',
+ templateUrl: './logbook-operation-list.component.html',
+ styleUrls: ['./logbook-operation-list.component.scss']
})
-export class ApiSupervisionListComponent extends InfiniteScrollTable<Event> implements OnInit, OnChanges {
+export class LogbookOperationListComponent extends InfiniteScrollTable<Event> implements OnInit, OnChanges {
@Input() tenantIdentifier: number;
@Input() filters: Readonly<EventFilter>;
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-routing.module.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-routing.module.ts
similarity index 90%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-routing.module.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-routing.module.ts
index 899938a6..f5274571 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision-routing.module.ts
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-routing.module.ts
@@ -37,8 +37,8 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { Route, RouterModule } from '@angular/router';
-import { VitamUITenantSelectComponent, TenantSelectionGuard, ActiveTenantGuard } from 'ui-frontend-common';
-import { ApiSupervisionComponent } from './api-supervision.component';
+import { ActiveTenantGuard, TenantSelectionGuard, VitamUITenantSelectComponent } from 'ui-frontend-common';
+import { LogbookOperationComponent } from './logbook-operation.component';
const routes: Route[] = [
{
@@ -54,7 +54,7 @@ const routes: Route[] = [
},
{
path: 'tenant/:tenantIdentifier',
- component: ApiSupervisionComponent,
+ component: LogbookOperationComponent,
canActivate: [ActiveTenantGuard]
}
];
@@ -70,4 +70,4 @@ const routes: Route[] = [
RouterModule
]
})
-export class ApiSupervisionRoutingModule { }
+export class LogbookOperationRoutingModule { }
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.component.html b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.component.html
similarity index 90%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.component.html
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.component.html
index b5773e24..7db7af66 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.component.html
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.component.html
@@ -1,8 +1,8 @@
<mat-sidenav-container [autosize]="true" [hasBackdrop]="false">
<mat-sidenav #panel mode="side" position="end" [fixedInViewport]="true">
- <app-api-supervision-detail *ngIf="openedItem" [tenantIdentifier]="tenantIdentifier" [eventId]="openedItem?.id"
- (closePanel)="closePanel()"></app-api-supervision-detail>
+ <app-logbook-operation-detail *ngIf="openedItem" [tenantIdentifier]="tenantIdentifier" [eventId]="openedItem?.id"
+ (closePanel)="closePanel()"></app-logbook-operation-detail>
</mat-sidenav>
<mat-sidenav-content>
@@ -12,7 +12,7 @@
<vitamui-common-navbar [appId]="appId" [hideTenantMenu]="false" [hideCustomerMenu]="true" (tenantSelect)="changeTenant($event)"></vitamui-common-navbar>
<div class="controls">
<h2 i18n="@@apiSupervisionPageTitle">
- <img src="assets/mini-logo-vitam.png"> Supervision des <strong>API</strong>s
+ <img src="assets/mini-logo-vitam.png"> Journal des Opérations
</h2>
<div class="actions">
@@ -80,7 +80,7 @@
</div>
<div class="vitamui-body vitamui-container">
- <app-api-supervision-list [filters]="filters" [tenantIdentifier]="tenantIdentifier" (eventClick)="openPanel($event)"></app-api-supervision-list>
+ <app-logbook-operation-list [filters]="filters" [tenantIdentifier]="tenantIdentifier" (eventClick)="openPanel($event)"></app-logbook-operation-list>
</div>
</mat-sidenav-content>
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.component.scss b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.component.scss
similarity index 100%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.component.scss
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.component.scss
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.component.spec.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.component.spec.ts
similarity index 88%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.component.spec.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.component.spec.ts
index 0d10fca2..423487b6 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.component.spec.ts
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.component.spec.ts
@@ -35,7 +35,7 @@
* knowledge of the CeCILL-C license and that you accept its terms.
*/
-import { GlobalEventService, ENVIRONMENT } from 'ui-frontend-common';
+import { ENVIRONMENT, GlobalEventService } from 'ui-frontend-common';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
@@ -43,14 +43,14 @@ import { ReactiveFormsModule } from '@angular/forms';
import { MatMenuModule } from '@angular/material';
import { ActivatedRoute, Router } from '@angular/router';
-import { ApiSupervisionComponent } from './api-supervision.component';
import { EMPTY } from 'rxjs';
-import { LogbookSearchService } from './logbook-search.service';
import { environment } from '../../environments/environment';
+import { LogbookOperationComponent } from './logbook-operation.component';
+import { LogbookSearchService } from './logbook-search.service';
-describe('ApiSupervisionComponent', () => {
- let component: ApiSupervisionComponent;
- let fixture: ComponentFixture<ApiSupervisionComponent>;
+describe('LogbookOperationComponent', () => {
+ let component: LogbookOperationComponent;
+ let fixture: ComponentFixture<LogbookOperationComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
@@ -58,7 +58,7 @@ describe('ApiSupervisionComponent', () => {
MatMenuModule,
ReactiveFormsModule
],
- declarations: [ApiSupervisionComponent],
+ declarations: [LogbookOperationComponent],
providers: [
{ provide: ActivatedRoute, useValue: { paramMap: EMPTY, data: EMPTY } },
{ provide: LogbookSearchService, useValue: { search: () => EMPTY } },
@@ -72,7 +72,7 @@ describe('ApiSupervisionComponent', () => {
}));
beforeEach(() => {
- fixture = TestBed.createComponent(ApiSupervisionComponent);
+ fixture = TestBed.createComponent(LogbookOperationComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.component.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.component.ts
similarity index 88%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.component.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.component.ts
index da8b33f7..5f32f266 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.component.ts
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.component.ts
@@ -40,21 +40,21 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
-import { ApiSupervisionListComponent } from './api-supervision-list/api-supervision-list.component';
import { EventFilter } from './event-filter.interface';
+import { LogbookOperationListComponent } from './logbook-operation-list/logbook-operation-list.component';
@Component({
- selector: 'app-api-supervision',
- templateUrl: './api-supervision.component.html',
- styleUrls: ['./api-supervision.component.scss']
+ selector: 'app-logbook-operation',
+ templateUrl: './logbook-operation.component.html',
+ styleUrls: ['./logbook-operation.component.scss']
})
-export class ApiSupervisionComponent extends SidenavPage<any> implements OnInit {
+export class LogbookOperationComponent extends SidenavPage<any> implements OnInit {
dateRangeFilterForm: FormGroup;
tenantIdentifier: number;
filters: Readonly<EventFilter> = {};
- @ViewChild(ApiSupervisionListComponent, { static: true }) list: ApiSupervisionListComponent;
+ @ViewChild(LogbookOperationListComponent, { static: true }) list: LogbookOperationListComponent;
constructor(
private route: ActivatedRoute,
@@ -82,7 +82,7 @@ export class ApiSupervisionComponent extends SidenavPage<any> implements OnInit
ngOnInit() {
if (!this.list) {
- console.error('ApiSupervisionComponent Error: no list in the template');
+ console.error('LogbookOperationComponent Error: no list in the template');
}
}
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.module.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.module.ts
similarity index 69%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.module.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.module.ts
index 8fa48390..d8326962 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/api-supervision.module.ts
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation.module.ts
@@ -40,28 +40,28 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import {
- MatDatepickerModule, MatMenuModule, MatProgressSpinnerModule, MatSidenavModule, MatTabsModule, MatNativeDateModule
+ MatDatepickerModule, MatMenuModule, MatNativeDateModule, MatProgressSpinnerModule, MatSidenavModule, MatTabsModule
} from '@angular/material';
import {
- ApiSupervisionDetailComponent
-} from './api-supervision-detail/api-supervision-detail.component';
+ LogbookOperationDetailComponent
+} from './logbook-operation-detail/logbook-operation-detail.component';
import {
- ApiSupervisionPopupComponent
-} from './api-supervision-detail/api-supervision-popup.component';
-import { ApiSupervisionListComponent } from './api-supervision-list/api-supervision-list.component';
-import { EventTypeBadgeClassPipe } from './api-supervision-list/event-type-badge-class.pipe';
-import { EventTypeColorClassPipe } from './api-supervision-list/event-type-color-class.pipe';
-import { LastEventPipe } from './api-supervision-list/last-event.pipe';
-import { ApiSupervisionComponent } from './api-supervision.component';
-import { ApiSupervisionRoutingModule } from './api-supervision-routing.module';
+ LogbookOperationPopupComponent
+} from './logbook-operation-detail/logbook-operation-popup.component';
+import { EventTypeBadgeClassPipe } from './logbook-operation-list/event-type-badge-class.pipe';
+import { EventTypeColorClassPipe } from './logbook-operation-list/event-type-color-class.pipe';
+import { LastEventPipe } from './logbook-operation-list/last-event.pipe';
+import { LogbookOperationListComponent } from './logbook-operation-list/logbook-operation-list.component';
+import { LogbookOperationRoutingModule } from './logbook-operation-routing.module';
+import { LogbookOperationComponent } from './logbook-operation.component';
@NgModule({
declarations: [
- ApiSupervisionComponent,
- ApiSupervisionListComponent,
- ApiSupervisionDetailComponent,
- ApiSupervisionPopupComponent,
+ LogbookOperationComponent,
+ LogbookOperationListComponent,
+ LogbookOperationDetailComponent,
+ LogbookOperationPopupComponent,
LastEventPipe,
EventTypeColorClassPipe,
EventTypeBadgeClassPipe,
@@ -75,8 +75,8 @@ import { ApiSupervisionRoutingModule } from './api-supervision-routing.module';
MatTabsModule,
ReactiveFormsModule,
VitamUICommonModule,
- ApiSupervisionRoutingModule,
+ LogbookOperationRoutingModule,
MatNativeDateModule
]
})
-export class ApiSupervisionModule { }
+export class LogbookOperationModule { }
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/logbook-search.service.spec.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-search.service.spec.ts
similarity index 100%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/logbook-search.service.spec.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-search.service.spec.ts
diff --git a/ui/ui-frontend/projects/referential/src/app/supervision-api/logbook-search.service.ts b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-search.service.ts
similarity index 100%
rename from ui/ui-frontend/projects/referential/src/app/supervision-api/logbook-search.service.ts
rename to ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-search.service.ts
index 8d33ebb6..7d7cdb00 100644
--- a/ui/ui-frontend/projects/referential/src/app/supervision-api/logbook-search.service.ts
+++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-search.service.ts
@@ -34,10 +34,10 @@
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL-C license and that you accept its terms.
*/
+import * as moment from 'moment';
import {
Event, LogbookApiService, PageRequest, SearchService, VitamSelectOperator, VitamSelectQuery
} from 'ui-frontend-common';
-import * as moment from 'moment';
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
--
GitLab