diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index b93ad22d0c..f274469f0d 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -18,6 +18,18 @@
+
+ {{ process.startTime }}
+
+
+
+ {{ process.endTime }}
+
+
+
+ {{ process.processStatus }}
+
+
diff --git a/src/app/process-page/new/new-process.component.spec.ts b/src/app/process-page/new/new-process.component.spec.ts
index ae7a965ee1..826f2744ff 100644
--- a/src/app/process-page/new/new-process.component.spec.ts
+++ b/src/app/process-page/new/new-process.component.spec.ts
@@ -12,6 +12,8 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
import { of as observableOf } from 'rxjs';
import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { RequestService } from '../../core/data/request.service';
+import { Router } from '@angular/router';
describe('NewProcessComponent', () => {
let component: NewProcessComponent;
@@ -57,6 +59,8 @@ describe('NewProcessComponent', () => {
providers: [
{ provide: ScriptDataService, useValue: scriptService },
{ provide: NotificationsService, useClass: NotificationsServiceStub },
+ { provide: RequestService, useValue: {} },
+ { provide: Router, useValue: {} },
],
schemas: [NO_ERRORS_SCHEMA]
})
diff --git a/src/app/process-page/new/new-process.component.ts b/src/app/process-page/new/new-process.component.ts
index 9d45354651..8bd5232e6d 100644
--- a/src/app/process-page/new/new-process.component.ts
+++ b/src/app/process-page/new/new-process.component.ts
@@ -9,7 +9,8 @@ import { RequestEntry } from '../../core/data/request.reducer';
import { NotificationsService } from '../../shared/notifications/notifications.service';
import { TranslateService } from '@ngx-translate/core';
import { take } from 'rxjs/operators';
-import { pipe } from 'rxjs';
+import { RequestService } from '../../core/data/request.service';
+import { Router } from '@angular/router';
/**
* Component to create a new script
@@ -45,7 +46,12 @@ export class NewProcessComponent implements OnInit {
*/
public missingParameters = [];
- constructor(private scriptService: ScriptDataService, private notificationsService: NotificationsService, private translationService: TranslateService) {
+ constructor(
+ private scriptService: ScriptDataService,
+ private notificationsService: NotificationsService,
+ private translationService: TranslateService,
+ private requestService: RequestService,
+ private router: Router) {
}
ngOnInit(): void {
@@ -75,6 +81,7 @@ export class NewProcessComponent implements OnInit {
const title = this.translationService.get('process.new.notification.success.title');
const content = this.translationService.get('process.new.notification.success.content');
this.notificationsService.success(title, content)
+ this.sendBack();
} else {
const title = this.translationService.get('process.new.notification.error.title');
const content = this.translationService.get('process.new.notification.error.content');
@@ -123,6 +130,13 @@ export class NewProcessComponent implements OnInit {
}
return this.missingParameters.length > 0;
}
+
+ private sendBack() {
+ this.requestService.removeByHrefSubstring('/processes');
+ /* should subscribe on the previous method to know the action is finished and then navigate,
+ will fix this when the removeByHrefSubstring changes are merged */
+ this.router.navigateByUrl('/processes');
+ }
}
export function controlContainerFactory(controlContainer?: ControlContainer) {
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index 6992286d95..30eb44430e 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -1,33 +1,38 @@
-
{{'process.overview.title' | translate}}
-
0"
- [paginationOptions]="pageConfig"
- [pageInfoState]="(processesRD$ | async)?.payload"
- [collectionSize]="(processesRD$ | async)?.payload?.totalElements"
- [hideGear]="true"
- [hidePagerWhenSinglePage]="true"
- (pageChange)="onPageChange($event)">
-
-
-
- {{'process.overview.table.id' | translate}} |
- {{'process.overview.table.name' | translate}} |
- {{'process.overview.table.user' | translate}} |
- {{'process.overview.table.start' | translate}} |
- {{'process.overview.table.finish' | translate}} |
- {{'process.overview.table.status' | translate}} |
-
-
-
-
- {{process.processId}} |
- {{process.scriptName}} |
- {{ePersonName}} |
- {{process.startTime | date:dateFormat}} |
- {{process.endTime | date:dateFormat}} |
- {{process.processStatus}} |
-
-
-
-
+
+
{{'process.overview.title' | translate}}
+
+
+
0"
+ [paginationOptions]="pageConfig"
+ [pageInfoState]="(processesRD$ | async)?.payload"
+ [collectionSize]="(processesRD$ | async)?.payload?.totalElements"
+ [hideGear]="true"
+ [hidePagerWhenSinglePage]="true"
+ (pageChange)="onPageChange($event)">
+
+
+
+
+ {{'process.overview.table.id' | translate}} |
+ {{'process.overview.table.name' | translate}} |
+ {{'process.overview.table.user' | translate}} |
+ {{'process.overview.table.start' | translate}} |
+ {{'process.overview.table.finish' | translate}} |
+ {{'process.overview.table.status' | translate}} |
+
+
+
+
+ {{process.processId}} |
+ {{process.scriptName}} |
+ {{ePersonName}} |
+ {{process.startTime | date:dateFormat}} |
+ {{process.endTime | date:dateFormat}} |
+ {{process.processStatus}} |
+
+
+
+
+
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index d6becf67c9..05f9cb6f63 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1965,6 +1965,12 @@
"process.detail.title" : "Process: {{ id }} - {{ name }}",
+ "process.detail.start-time" : "Start time",
+
+ "process.detail.end-time" : "Finish time",
+
+ "process.detail.status" : "Status",
+
"process.overview.table.finish" : "Finish time",
@@ -1983,6 +1989,8 @@
"process.overview.breadcrumbs": "Processes Overview",
+ "process.overview.new": "New",
+
"profile.breadcrumbs": "Update Profile",