From 1cfe3431621ad25066fb6a70b0484a922e51f0b0 Mon Sep 17 00:00:00 2001
From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu>
Date: Fri, 11 Oct 2024 09:04:29 +0200
Subject: [PATCH] [EDELIVERY-140001] allow to create access tokens which are
not yet valid
---
.../access-token-panel.component.html | 2 +-
.../access-token-panel.component.ts | 15 +--------------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.html b/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.html
index 65e3e708d..3a0c1ae3c 100644
--- a/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.html
+++ b/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.html
@@ -74,7 +74,7 @@
[for]="picker"></mat-datepicker-toggle>
<mat-date-range-picker #picker></mat-date-range-picker>
<smp-field-error
- *ngIf="credentialForm.controls.activeFrom.hasError('matStartDateInvalid') || credentialForm.controls.activeFrom.hasError('required')">{{ "access.token.panel.error.invalid.start.date" | translate }}
+ *ngIf="credentialForm.controls.activeFrom.hasError('required')">{{ "access.token.panel.error.invalid.start.date" | translate }}
</smp-field-error>
<smp-field-error
*ngIf="credentialForm.controls.expireOn.hasError('matEndDateInvalid') || credentialForm.controls.expireOn.hasError('required')">{{ "access.token.panel.error.invalid.end.date" | translate }}
diff --git a/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.ts b/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.ts
index 285eb0024..a2d861aa7 100644
--- a/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.ts
+++ b/smp-angular/src/app/user-settings/user-access-tokens/access-token-panel/access-token-panel.component.ts
@@ -10,19 +10,6 @@ import {BeforeLeaveGuard} from "../../../window/sidenav/navigation-on-leave-guar
import {GlobalLookups} from "../../../common/global-lookups";
-export function notAfterCurrentDateValidator(): ValidatorFn {
- return (control: AbstractControl): { [key: string]: any } | null => {
- let date = control.value;
- if (date) {
- // make date mutable and the modification
- date = new Date(date);
- date.setHours(0, 0, 0, 0);
- }
- const forbidden = date && date > Date.now();
-
- return forbidden ? { 'matStartDateInvalid': { value: control.value } } : null;
- };
-}
export function notBeforeCurrentDateValidator(): ValidatorFn {
return (control: AbstractControl): { [key: string]: any } | null => {
@@ -62,7 +49,7 @@ export class AccessTokenPanelComponent implements BeforeLeaveGuard {
'name': new FormControl({value: '', disabled: true}),
'active': new FormControl({value: '', disabled: false}),
'description': new FormControl({value: '', disabled: false}),
- 'activeFrom': new FormControl({value: '', disabled: false}, [notAfterCurrentDateValidator()]),
+ 'activeFrom': new FormControl({value: '', disabled: false} ),
'expireOn': new FormControl({value: '', disabled: false}, [notBeforeCurrentDateValidator()])
});
--
GitLab