bug #13500 : wrong regex error messages

ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts

@@ -60,7 +60,7 @@ import { FileTreeService } from '../file-tree/file-tree.service';
 import { AttributesPopupComponent } from './attributes/attributes.component';
 import { FileTreeMetadataService } from './file-tree-metadata.service';
 import { filter, map, tap } from 'rxjs/operators';
-import { Logger } from 'vitamui-library';
+import { DatePatternConstants, Logger } from 'vitamui-library';
 import { BreadcrumbService } from '../../../core/services/breadcrumb.service';
 
 const FILE_TREE_METADATA_TRANSLATE_PATH = 'PROFILE.EDIT_PROFILE.FILE_TREE_METADATA';
@@ -125,10 +125,10 @@ export class FileTreeMetadataComponent implements OnInit, OnDestroy {
   regex: string;
   customRegex: string;
   private formatagePredefini: Array<{ label: string; value: string }> = [
-    { label: 'AAAA-MM-JJ', value: '^[0-9]{4}-[0-9]{2}-[0-9]{2}$' },
-    { label: 'AAAA-MM-JJTHH:MM:SS', value: '^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}$' },
-    { label: 'AAAA', value: '^[0-9]{4}$' },
-    { label: 'AAAA-MM', value: '^[0-9]{4}-[0-9]{2}$' },
+    { label: 'AAAA-MM-JJ', value: DatePatternConstants.YEAR_MONTH_DAY },
+    { label: 'AAAA-MM-JJTHH:MM:SS', value: DatePatternConstants.FULL_DATE },
+    { label: 'AAAA', value: DatePatternConstants.YEAR },
+    { label: 'AAAA-MM', value: DatePatternConstants.YEAR_MONTH },
   ];
   availableRegex: Array<{ label: string; value: string }>;
   public breadcrumbDataTop: Array<BreadcrumbDataTop>;

ui/ui-frontend/projects/vitamui-library/src/app/modules/archive-unit/archive-unit-template.ts

@@ -428,7 +428,6 @@ export const customTemplate: DisplayRule[] = [
     Path: 'Version',
     ui: {
       Path: 'Generalities.Characteristics.Version',
-      component: 'textfield',
       layout: {
         columns: 1,
         size: 'small',

ui/ui-frontend/projects/vitamui-library/src/app/modules/components/vitamui-input/vitamui-input-error.component.scss

@@ -0,0 +1,16 @@
+@import '../../../../sass/variables/colors';
+
+:host {
+  font-size: 12px;
+  font-weight: 400;
+  width: 100%;
+  color: $red;
+  display: flex;
+  align-items: center;
+  padding: 5px 0 0 0;
+
+  i {
+    font-size: 12px;
+    margin-right: 5px;
+  }
+}

ui/ui-frontend/projects/vitamui-library/src/app/modules/dates.constants.ts

@@ -0,0 +1,6 @@
+export enum DatePatternConstants {
+  YEAR = '^[0-9]{4}$',
+  YEAR_MONTH = '^[0-9]{4}-[0-9]{2}$',
+  YEAR_MONTH_DAY = '^[0-9]{4}-[0-9]{2}-[0-9]{2}$',
+  FULL_DATE = '^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}$',
+}

ui/ui-frontend/projects/vitamui-library/src/app/modules/object-editor/components/primitive-editor/primitive-editor.component.html

@@ -27,7 +27,7 @@
       *ngSwitchCase="'datepicker'"
       [formControl]="editObject.control"
       [label]="editObject.displayRule.ui.label | translate | empty | appendStar: editObject.required"
-      pickerType="day"
+      [pickerType]="getPickerType(editObject)"
     >
       <vitamui-editor-hint [control]="editObject.control" [hint]="editObject.hint"></vitamui-editor-hint>
       <vitamui-form-error-display [control]="editObject.control"></vitamui-form-error-display>
@@ -36,7 +36,7 @@
       *ngSwitchCase="'datetime'"
       [formControl]="editObject.control"
       [label]="editObject.displayRule.ui.label | translate | empty | appendStar: editObject.required"
-      pickerType="day"
+      [pickerType]="getPickerType(editObject)"
     >
       <vitamui-editor-hint [control]="editObject.control" [hint]="editObject.hint"></vitamui-editor-hint>
       <vitamui-form-error-display [control]="editObject.control"></vitamui-form-error-display>

ui/ui-frontend/projects/vitamui-library/src/app/modules/object-editor/components/primitive-editor/primitive-editor.component.ts

@@ -4,6 +4,7 @@ import { DateDisplayService } from '../../../object-viewer/services/date-display
 import { ComponentType } from '../../../object-viewer/types';
 import { EditObject } from '../../models/edit-object.model';
 import { FormControl } from '@angular/forms';
+import { DatePatternConstants } from '../../../dates.constants';
 
 @Component({
   selector: 'vitamui-common-primitive-editor',
@@ -30,4 +31,17 @@ export class PrimitiveEditorComponent implements OnInit {
   }
 
   protected readonly FormControl = FormControl;
+
+  getPickerType(editObject: EditObject) {
+    if (editObject.pattern) {
+      if (editObject.pattern === DatePatternConstants.YEAR) {
+        return 'year';
+      } else if (editObject.pattern === DatePatternConstants.YEAR_MONTH_DAY) {
+        return 'day';
+      } else if (editObject.pattern === DatePatternConstants.YEAR_MONTH) {
+        return 'month';
+      }
+    }
+    return 'day';
+  }
 }

ui/ui-frontend/projects/vitamui-library/src/app/modules/object-viewer/services/schema-element-to-display-rule.service.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { DisplayRule, ProfiledSchemaElement, SchemaElement } from '../models';
 import { LayoutSize } from '../types';
+import { DatePatternConstants } from '../../dates.constants';
 
 type ComponentName =
   | 'balise-n1'
@@ -184,6 +185,24 @@ export class SchemaElementToDisplayRuleService {
         const isSpecial = schemaElement.Path.includes('_.');
         const isSelect = (schemaElement as ProfiledSchemaElement).Control?.Type === 'SELECT' || false;
 
+        const control = (schemaElement as ProfiledSchemaElement).Control;
+
+        if (control) {
+          if (
+            control.Type === 'REGEX' &&
+            [
+              DatePatternConstants.YEAR.toString(),
+              DatePatternConstants.YEAR_MONTH.toString(),
+              DatePatternConstants.YEAR_MONTH_DAY.toString(),
+              DatePatternConstants.FULL_DATE.toString(),
+            ].includes(control.Value)
+          ) {
+            return 'datepicker-date';
+          } else {
+            return defaultComponent;
+          }
+        }
+
         if (isSelect && isUnique) return 'select-mono';
         if (isSelect && isMultiple) return 'select-multi';
 

ui/ui-frontend/projects/vitamui-library/src/public-api.ts

@@ -172,3 +172,4 @@ export * from './app/modules/subrogation/subrogation-banner/subrogation-banner.c
 export * from './app/modules/subrogation/subrogation.module';
 export * from './app/modules/object-viewer/services/type.service';
 export * from './app/modules/object-editor/pattern.validator';
+export * from './app/modules/dates.constants';