v11.19.0

klee-contrib · Sep 1, 2024 · 6677f0f · 6677f0f
1 parent c9a0c9d
commit 6677f0f
Show file tree

Hide file tree

Showing 14 changed files with 373 additions and 524 deletions.
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,20 +1,16 @@
 {
     "bracketSpacing": false,
+    "endOfLine": "crlf",
     "arrowParens": "avoid",
     "trailingComma": "none",
     "tabWidth": 4,
     "printWidth": 120,
     "overrides": [
         {
-            "files": [
-                "package.json",
-                "package-lock.json",
-                "src/model/**",
-                "src/services/**"
-            ],
+            "files": ["package.json", "package-lock.json", "src/model/**", "src/services/**"],
             "options": {
                 "printWidth": 50000
             }
         }
     ]
-}
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,9 +1,9 @@
-{
-    "typescript.tsdk": "./node_modules/typescript/lib",
-    "editor.snippetSuggestions": "bottom",
-    "files.trimTrailingWhitespace": true,
-    "editor.formatOnSave": true,
-    "editor.codeActionsOnSave": {
-        "source.fixAll": "explicit"
-    }
-}
+{
+    "typescript.tsdk": "./node_modules/typescript/lib",
+    "editor.snippetSuggestions": "bottom",
+    "files.trimTrailingWhitespace": true,
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+        "source.fixAll": "explicit"
+    }
+}
diff --git a/index.html b/index.html
@@ -1,6 +1,6 @@
 <html lang="fr">
     <head>
-        <title>Starter Kit Focus v4 - 11.18.2</title>
+        <title>Starter Kit Focus v4 - 11.19.0</title>
         <link rel="preconnect" href="https://fonts.googleapis.com" />
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
         <link

diff --git a/mock/profils/get-profils.mock.ts b/mock/profils/get-profils.mock.ts
@@ -9,6 +9,6 @@ export default defineMock({
     delay: 100,
     body: () =>
         profils.value.map(
-            ({id, libelle, utilisateurs}) => ({id, libelle, nombreUtilisateurs: utilisateurs?.length} as ProfilItem)
+            ({id, libelle, utilisateurs}) => ({id, libelle, nombreUtilisateurs: utilisateurs?.length}) as ProfilItem
         )
 });
diff --git a/mock/utilisateurs/get-utilisateurs.mock.ts b/mock/utilisateurs/get-utilisateurs.mock.ts
@@ -10,6 +10,6 @@ export default defineMock({
     body: () =>
         utilisateurs.value.map(
             ({id, nom, prenom, email, typeUtilisateurCode}) =>
-                ({id, nom, prenom, email, typeUtilisateurCode} as UtilisateurItem)
+                ({id, nom, prenom, email, typeUtilisateurCode}) as UtilisateurItem
         )
 });
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "focus4-starter-kit",
-    "version": "11.18.1",
+    "version": "11.19.0",
     "description": "Starter kit pour Focus V4",
     "repository": "http://www.github.com/klee-contrib/focus4-starter-kit",
     "main": "src/index.ts",
@@ -13,9 +13,9 @@
         "start": "vite"
     },
     "dependencies": {
-        "@focus4/tooling": "11.18.0",
-        "focus4": "11.18.2",
-        "vite-plugin-mock-dev-server": "1.5.1"
+        "@focus4/tooling": "11.19.0",
+        "focus4": "11.19.0",
+        "vite-plugin-mock-dev-server": "1.7.1"
     },
     "devDependencies": {
         "@flydotio/dockerfile": "0.5.8"
@@ -36,8 +36,6 @@
         "mobx-react": "7",
         "numeral": "*",
         "react": "*",
-        "react-dnd": "*",
-        "react-dnd-html5-backend": "*",
         "react-dom": "*"
     },
     "author": "KleeGroup",

diff --git a/src/locale/securite.ts b/src/locale/securite.ts
@@ -10,17 +10,16 @@ export const securite = {
             typeDroitCode: "TypeDroitCode"
         },
         profil: {
-            dateCreation: "Date de création",
-            dateModification: "Date de modification",
             droits: "Droits",
             id: "Id technique du profil",
             libelle: "Libellé du profil"
         },
         profilItem: {
-            id: "Id technique du profil",
-            libelle: "Libellé du profil",
             nombreUtilisateurs: "Nombre d'utilisateurs affectés"
         },
+        profilRead: {
+            utilisateurs: "Utilisateurs"
+        },
         typeDroit: {
             code: "Type de droit",
             libelle: "Libelle"
@@ -34,8 +33,6 @@ export const securite = {
         utilisateur: {
             actif: "Actif",
             adresse: "Adresse",
-            dateCreation: "Date de création",
-            dateModification: "Date de modification",
             dateNaissance: "Date de naissance",
             email: "Adresse email",
             id: "Id technique",

diff --git a/src/model/securite/profil/profil-item.ts b/src/model/securite/profil/profil-item.ts
@@ -5,11 +5,11 @@
 import {EntityToType, FieldEntry2} from "@focus4/stores";
 import {DO_ENTIER, DO_ID, DO_LIBELLE} from "../../../domains";
 
-export type ProfilItem = EntityToType<ProfilItemEntityType>
+export type ProfilItem = EntityToType<ProfilItemEntityType>;
 export interface ProfilItemEntityType {
-    id: FieldEntry2<typeof DO_ID, number>,
-    libelle: FieldEntry2<typeof DO_LIBELLE, string>,
-    nombreUtilisateurs: FieldEntry2<typeof DO_ENTIER, number>
+    id: FieldEntry2<typeof DO_ID, number>;
+    libelle: FieldEntry2<typeof DO_LIBELLE, string>;
+    nombreUtilisateurs: FieldEntry2<typeof DO_ENTIER, number>;
 }
 
 export const ProfilItemEntity: ProfilItemEntityType = {
@@ -34,4 +34,4 @@ export const ProfilItemEntity: ProfilItemEntityType = {
         isRequired: true,
         label: "securite.profil.profilItem.nombreUtilisateurs"
     }
-}
+};
diff --git a/src/model/securite/profil/profil-read.ts b/src/model/securite/profil/profil-read.ts
@@ -8,14 +8,14 @@ import {DO_CODE_LISTE, DO_DATE_HEURE, DO_ID, DO_LIBELLE} from "../../../domains"
 import {UtilisateurItemEntity, UtilisateurItemEntityType} from "../utilisateur/utilisateur-item";
 import {DroitCode} from "./references";
 
-export type ProfilRead = EntityToType<ProfilReadEntityType>
+export type ProfilRead = EntityToType<ProfilReadEntityType>;
 export interface ProfilReadEntityType {
-    id: FieldEntry2<typeof DO_ID, number>,
-    libelle: FieldEntry2<typeof DO_LIBELLE, string>,
-    droits: FieldEntry2<typeof DO_CODE_LISTE, DroitCode[]>,
-    dateCreation: FieldEntry2<typeof DO_DATE_HEURE, string>,
-    dateModification: FieldEntry2<typeof DO_DATE_HEURE, string>,
-    utilisateurs: ListEntry<UtilisateurItemEntityType>
+    id: FieldEntry2<typeof DO_ID, number>;
+    libelle: FieldEntry2<typeof DO_LIBELLE, string>;
+    droits: FieldEntry2<typeof DO_CODE_LISTE, DroitCode[]>;
+    dateCreation: FieldEntry2<typeof DO_DATE_HEURE, string>;
+    dateModification: FieldEntry2<typeof DO_DATE_HEURE, string>;
+    utilisateurs: ListEntry<UtilisateurItemEntityType>;
 }
 
 export const ProfilReadEntity: ProfilReadEntityType = {
@@ -56,6 +56,8 @@ export const ProfilReadEntity: ProfilReadEntityType = {
     },
     utilisateurs: {
         type: "list",
-        entity: UtilisateurItemEntity
+        entity: UtilisateurItemEntity,
+        isRequired: true,
+        label: "securite.profil.profilRead.utilisateurs"
     }
-}
+};
diff --git a/src/model/securite/profil/profil-write.ts b/src/model/securite/profil/profil-write.ts
@@ -7,10 +7,10 @@ import {DO_CODE_LISTE, DO_LIBELLE} from "../../../domains";
 
 import {DroitCode} from "./references";
 
-export type ProfilWrite = EntityToType<ProfilWriteEntityType>
+export type ProfilWrite = EntityToType<ProfilWriteEntityType>;
 export interface ProfilWriteEntityType {
-    libelle: FieldEntry2<typeof DO_LIBELLE, string>,
-    droits: FieldEntry2<typeof DO_CODE_LISTE, DroitCode[]>
+    libelle: FieldEntry2<typeof DO_LIBELLE, string>;
+    droits: FieldEntry2<typeof DO_CODE_LISTE, DroitCode[]>;
 }
 
 export const ProfilWriteEntity: ProfilWriteEntityType = {
@@ -28,4 +28,4 @@ export const ProfilWriteEntity: ProfilWriteEntityType = {
         isRequired: false,
         label: "securite.profil.profil.droits"
     }
-}
+};
diff --git a/src/model/securite/utilisateur/utilisateur-item.ts b/src/model/securite/utilisateur/utilisateur-item.ts
@@ -7,13 +7,13 @@ import {DO_CODE, DO_EMAIL, DO_ID, DO_LIBELLE} from "../../../domains";
 
 import {TypeUtilisateurCode} from "./references";
 
-export type UtilisateurItem = EntityToType<UtilisateurItemEntityType>
+export type UtilisateurItem = EntityToType<UtilisateurItemEntityType>;
 export interface UtilisateurItemEntityType {
-    id: FieldEntry2<typeof DO_ID, number>,
-    nom: FieldEntry2<typeof DO_LIBELLE, string>,
-    prenom: FieldEntry2<typeof DO_LIBELLE, string>,
-    email: FieldEntry2<typeof DO_EMAIL, string>,
-    typeUtilisateurCode: FieldEntry2<typeof DO_CODE, TypeUtilisateurCode>
+    id: FieldEntry2<typeof DO_ID, number>;
+    nom: FieldEntry2<typeof DO_LIBELLE, string>;
+    prenom: FieldEntry2<typeof DO_LIBELLE, string>;
+    email: FieldEntry2<typeof DO_EMAIL, string>;
+    typeUtilisateurCode: FieldEntry2<typeof DO_CODE, TypeUtilisateurCode>;
 }
 
 export const UtilisateurItemEntity: UtilisateurItemEntityType = {
@@ -49,8 +49,8 @@ export const UtilisateurItemEntity: UtilisateurItemEntityType = {
         type: "field",
         name: "typeUtilisateurCode",
         domain: DO_CODE,
-        isRequired: true,
         defaultValue: "GEST",
+        isRequired: true,
         label: "securite.utilisateur.utilisateur.typeUtilisateurCode"
     }
-}
+};
diff --git a/src/model/securite/utilisateur/utilisateur-read.ts b/src/model/securite/utilisateur/utilisateur-read.ts
@@ -7,19 +7,19 @@ import {DO_BOOLEEN, DO_CODE, DO_DATE, DO_DATE_HEURE, DO_EMAIL, DO_ID, DO_LIBELLE
 
 import {TypeUtilisateurCode} from "./references";
 
-export type UtilisateurRead = EntityToType<UtilisateurReadEntityType>
+export type UtilisateurRead = EntityToType<UtilisateurReadEntityType>;
 export interface UtilisateurReadEntityType {
-    id: FieldEntry2<typeof DO_ID, number>,
-    nom: FieldEntry2<typeof DO_LIBELLE, string>,
-    prenom: FieldEntry2<typeof DO_LIBELLE, string>,
-    email: FieldEntry2<typeof DO_EMAIL, string>,
-    dateNaissance: FieldEntry2<typeof DO_DATE, string>,
-    adresse: FieldEntry2<typeof DO_LIBELLE, string>,
-    actif: FieldEntry2<typeof DO_BOOLEEN, boolean>,
-    profilId: FieldEntry2<typeof DO_ID, number>,
-    typeUtilisateurCode: FieldEntry2<typeof DO_CODE, TypeUtilisateurCode>,
-    dateCreation: FieldEntry2<typeof DO_DATE_HEURE, string>,
-    dateModification: FieldEntry2<typeof DO_DATE_HEURE, string>
+    id: FieldEntry2<typeof DO_ID, number>;
+    nom: FieldEntry2<typeof DO_LIBELLE, string>;
+    prenom: FieldEntry2<typeof DO_LIBELLE, string>;
+    email: FieldEntry2<typeof DO_EMAIL, string>;
+    dateNaissance: FieldEntry2<typeof DO_DATE, string>;
+    adresse: FieldEntry2<typeof DO_LIBELLE, string>;
+    actif: FieldEntry2<typeof DO_BOOLEEN, boolean>;
+    profilId: FieldEntry2<typeof DO_ID, number>;
+    typeUtilisateurCode: FieldEntry2<typeof DO_CODE, TypeUtilisateurCode>;
+    dateCreation: FieldEntry2<typeof DO_DATE_HEURE, string>;
+    dateModification: FieldEntry2<typeof DO_DATE_HEURE, string>;
 }
 
 export const UtilisateurReadEntity: UtilisateurReadEntityType = {
@@ -69,8 +69,8 @@ export const UtilisateurReadEntity: UtilisateurReadEntityType = {
         type: "field",
         name: "actif",
         domain: DO_BOOLEEN,
-        isRequired: true,
         defaultValue: true,
+        isRequired: true,
         label: "securite.utilisateur.utilisateur.actif"
     },
     profilId: {
@@ -84,8 +84,8 @@ export const UtilisateurReadEntity: UtilisateurReadEntityType = {
         type: "field",
         name: "typeUtilisateurCode",
         domain: DO_CODE,
-        isRequired: true,
         defaultValue: "GEST",
+        isRequired: true,
         label: "securite.utilisateur.utilisateur.typeUtilisateurCode"
     },
     dateCreation: {
@@ -102,4 +102,4 @@ export const UtilisateurReadEntity: UtilisateurReadEntityType = {
         isRequired: false,
         label: "common.entityListeners.dateModification"
     }
-}
+};
diff --git a/src/model/securite/utilisateur/utilisateur-write.ts b/src/model/securite/utilisateur/utilisateur-write.ts
@@ -59,8 +59,8 @@ export const UtilisateurWriteEntity: UtilisateurWriteEntityType = {
         type: "field",
         name: "actif",
         domain: DO_BOOLEEN,
-        isRequired: true,
         defaultValue: true,
+        isRequired: true,
         label: "securite.utilisateur.utilisateur.actif"
     },
     profilId: {
@@ -74,8 +74,8 @@ export const UtilisateurWriteEntity: UtilisateurWriteEntityType = {
         type: "field",
         name: "typeUtilisateurCode",
         domain: DO_CODE,
-        isRequired: true,
         defaultValue: "GEST",
+        isRequired: true,
         label: "securite.utilisateur.utilisateur.typeUtilisateurCode"
     }
 };