fix: résolution des conflits de fusion sur les workflows

Reviewed-on: maximus/aegis#31

.env.example

@@ -0,0 +1 @@
+VITE_PB_URL=

.gitea/workflows/deploy-environments.yml

@@ -1,5 +1,93 @@
 name: Déploiement AEGIS Portal
 
+on:
+  push:
+    branches:
+      - dev
+      - test
+      - acc
+      - master
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    env:
+      GIT_SSL_NO_VERIFY: "true"
+      NODE_TLS_REJECT_UNAUTHORIZED: "0"
+
+    steps:
+      - name: Patch DNS local pour Gitea Runner
+        run: sudo echo "10.10.40.31 git.bunker.lan" | sudo tee -a /etc/hosts
+
+      - name: Configuration de Git pour SSL
+        run: git config --global http.sslVerify false
+
+      - name: Récupération du code
+        uses: actions/checkout@v4
+      
+      - name: Configuration de Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      
+      - name: Activation de pnpm
+        run: corepack enable pnpm
+      
+      - name: Installation des dépendances
+        run: pnpm install --frozen-lockfile
+      
+      - name: Compilation de la Build
+        env:
+          VITE_APP_ENV: ${{ github.ref_name }}
+          VITE_PB_URL: ${{ secrets.PB_URL }}
+        run: pnpm run build
+      
+      - name: Installation de lftp
+        run: sudo apt-get update && sudo apt-get install -y lftp
+      
+      - name: Routage et Déploiement FTP
+        env: # 1. On charge tous les secrets de manière sécurisée
+          SERVER: ${{ secrets.FTP_SERVER }}
+          DEV_U: ${{ secrets.DEV_FTP_USER }}
+          DEV_P: ${{ secrets.DEV_FTP_PASSWORD }}
+          TEST_U: ${{ secrets.TEST_FTP_USER }}
+          TEST_P: ${{ secrets.TEST_FTP_PASSWORD }}
+          ACC_U: ${{ secrets.ACC_FTP_USER }}
+          ACC_P: ${{ secrets.ACC_FTP_PASSWORD }}
+          PROD_U: ${{ secrets.PROD_FTP_USER }}
+          PROD_P: ${{ secrets.PROD_FTP_PASSWORD }}
+          BRANCH: ${{ github.ref_name }}
+        run: |
+          # 2. On attribue les bons identifiants selon la branche
+          if [ "$BRANCH" == "master" ]; then
+            TARGET_USER=$PROD_U; TARGET_PASS=$PROD_P;
+          elif [ "$BRANCH" == "acc" ]; then
+            TARGET_USER=$ACC_U; TARGET_PASS=$ACC_P;
+          elif [ "$BRANCH" == "test" ]; then
+            TARGET_USER=$TEST_U; TARGET_PASS=$TEST_P;
+          else
+            TARGET_USER=$DEV_U; TARGET_PASS=$DEV_P;
+          fi
+          
+          echo "Déploiement de la branche [$BRANCH]"
+          
+          # 3. Exécution du script FTP
+          cat << EOF > script.lftp
+          set ftp:passive-mode true
+          set ftp:ssl-allow no
+          set ssl:verify-certificate no
+          set net:timeout 5
+          set net:max-retries 2
+          set dns:fatal-timeout 2
+          open -u "${TARGET_USER}","${TARGET_PASS}" "${SERVER}"
+          cd home/${TARGET_USER}
+          mirror -R --delete --verbose dist/ ./
+          quit
+          EOF
+          
+          lftp -f script.lftp
+name: Déploiement AEGIS Portal
+
 on:
   push:
     branches:

.gitea/workflows/enforce-git-flow.yml

@@ -1,5 +1,45 @@
 name: Sécurité - Architecture Git-Flow
 
+on:
+  pull_request:
+    branches:
+      - dev
+      - test
+      - acc
+      - master
+
+jobs:
+  validate-flow:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Vérification du flux de promotion
+        run: |
+          TARGET_BRANCH="${{ github.base_ref }}"
+          SOURCE_BRANCH="${{ github.head_ref }}"
+          
+          echo "Tentative de promotion : $SOURCE_BRANCH ➔ $TARGET_BRANCH"
+          
+          # Règle 1 : Vers TEST (Doit venir de DEV)
+          if [ "$TARGET_BRANCH" == "test" ] && [ "$SOURCE_BRANCH" != "dev" ]; then
+            echo "ERREUR : L'environnement TEST ne peut recevoir que du code de DEV."
+            exit 1
+          fi
+          
+          # Règle 2 : Vers ACC (Doit venir de TEST)
+          if [ "$TARGET_BRANCH" == "acc" ] && [ "$SOURCE_BRANCH" != "test" ]; then
+            echo "ERREUR : L'environnement d'ACCEPTATION ne peut recevoir que du code de TEST."
+            exit 1
+          fi
+          
+          # Règle 3 : Vers PROD (Doit venir de ACC)
+          if [ "$TARGET_BRANCH" == "master" ] && [ "$SOURCE_BRANCH" != "acc" ]; then
+            echo "ERREUR : La PRODUCTION ne peut recevoir que du code validé en ACCEPTATION (acc)."
+            exit 1
+          fi
+          
+          echo "Flux réglementaire respecté ! Promotion autorisée."
+name: Sécurité - Architecture Git-Flow
+
 on:
   pull_request:
     branches:

.gitea/workflows/quality-checks.yml

@@ -1,5 +1,64 @@
 name: Contrôle Qualité & Sécurité (QA)
 
+on:
+  pull_request:
+    branches:
+      - dev
+      - test
+      - acc
+      - master
+
+jobs:
+  quality-gate:
+    name: qa-s-check
+    runs-on: ubuntu-latest
+    
+    env:
+      GIT_SSL_NO_VERIFY: "true"
+      NODE_TLS_REJECT_UNAUTHORIZED: "0"
+
+    steps:
+      - name: Patch DNS local pour Gitea Runner
+        run: sudo echo "10.10.40.31 git.bunker.lan" | sudo tee -a /etc/hosts
+
+      - name: Configuration de Git pour SSL
+        run: git config --global http.sslVerify false
+
+      - name: Récupération du code source
+        uses: actions/checkout@v4
+
+      - name: Configuration de Node.js (v22)
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Activation de pnpm
+        run: corepack enable pnpm
+
+      - name: Installation des dépendances
+        run: pnpm install --frozen-lockfile
+
+      # Étape 1 : ESLint (Syntaxe et conventions)
+      - name: Analyse Linter (ESLint)
+        run: pnpm run lint
+
+      # Étape 2 : Verification stricte des types TypeScript (sans émettre de fichiers)
+      - name: Verification des Types TypeScript
+        run: pnpm exec tsc --noEmit
+
+      # Étape 3 : Exécution des tests unitaires
+      - name: Tests Unitaires (Vitest)
+        run: pnpm run test -- --run
+
+      # Étape 4 : Audit des vulnérabilités npm (Niveau High/Critical)
+      - name: Audit de Sécurité des Dépendances
+        run: pnpm audit --audit-level=high
+
+      # Étape 5 : Validation de la compilation ViteJS
+      - name: Validation du Build de Production
+        run: pnpm run build
+name: Contrôle Qualité & Sécurité (QA)
+
 on:
   pull_request:
     branches:

App.test.ts

@@ -0,0 +1,7 @@
+import { describe, it, expect } from 'vitest';
+
+describe('AEGIS Initial Test', () => {
+  it('devrait valider que 1 + 1 font 2', () => {
+    expect(1 + 1).toBe(2);
+  });
+});

package.json

@@ -7,35 +7,37 @@
     "dev": "vite",
     "build": "tsc -b && vite build",
     "lint": "eslint .",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "test": "vitest"
   },
   "dependencies": {
     "@tailwindcss/vite": "^4.3.3",
     "@zitadel/react-auth": "^1.2.1",
     "clsx": "^2.1.1",
-    "lucide-react": "^1.27.0",
+    "lucide-react": "^1.28.0",
     "oidc-client-ts": "^3.5.0",
     "otpauth": "^9.5.1",
-    "pocketbase": "^0.27.0",
+    "pocketbase": "^0.27.1",
     "qrcode.react": "^4.2.0",
-    "react": "^19.2.7",
+    "react": "^19.2.8",
-    "react-dom": "^19.2.7",
+    "react-dom": "^19.2.8",
-    "react-router-dom": "^7.18.1",
+    "react-router-dom": "^7.18.2",
     "tailwind-merge": "^3.6.0",
     "tailwindcss": "^4.3.3"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.13.3",
-    "@types/react": "^19.2.17",
+    "@types/react": "^19.2.18",
-    "@types/react-dom": "^19.2.3",
+    "@types/react-dom": "^19.2.4",
-    "@vitejs/plugin-react": "^6.0.3",
+    "@vitejs/plugin-react": "^6.0.5",
-    "eslint": "^10.6.0",
+    "eslint": "^10.8.0",
     "eslint-plugin-react-hooks": "^7.1.1",
     "eslint-plugin-react-refresh": "^0.5.3",
-    "globals": "^17.7.0",
+    "globals": "^17.9.0",
-    "typescript": "~6.0.2",
+    "typescript": "~6.0.3",
-    "typescript-eslint": "^8.62.0",
+    "typescript-eslint": "^8.65.0",
-    "vite": "^8.1.1"
+    "vite": "^8.2.0",
+    "vitest": "^4.1.10"
   }
 }

pnpm-workspace.yaml

@@ -0,0 +1,3 @@
+overrides:
+  react-router: "^6.30.4"
+  react-router-dom: "^6.30.4"

src/components/widgets/NewTicketWidget.tsx

@@ -5,6 +5,8 @@ import { Button } from '@/components/ui/Button';
 import { Input } from '@/components/ui/Input';
 import { Select } from '@/components/ui/Select';
 import { Textarea } from '@/components/ui/Textarea';
+import type { TicketCategory } from '@/types/Category';
+import type { ButtonVariantStyle } from '@/styles/VariantStyle';
 
 interface NewTicketWidgetProps {
   onCancel: () => void;
@@ -15,13 +17,13 @@ export const NewTicketWidget: React.FC<NewTicketWidgetProps> = ({ onCancel, onSu
   const { createTicket, isSubmitting, error } = useCreateTicket();
 
   // États locaux isolés dans le widget
-  const [category, setCategory] = useState<'Incident Critique' | 'Évolution' | 'Administratif'>('Incident Critique');
+  const [category, setCategory] = useState<TicketCategory>('Incident Critique');
   const [ci, setCi] = useState('general');
   const [subject, setSubject] = useState('');
   const [affectedAsset, setAffectedAsset] = useState('');
   const [incidentTime, setIncidentTime] = useState('');
   const [description, setDescription] = useState('');
-  const [buttonVariant, setButtonVariant]=useState('primary');
+  const [buttonVariant, setButtonVariant]=useState<ButtonVariantStyle>('primary');
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
@@ -62,7 +64,7 @@ export const NewTicketWidget: React.FC<NewTicketWidgetProps> = ({ onCancel, onSu
               <Select
                 label="Type de demande"
                 value={category}
-                onChange={(e) => {setCategory(e.target.value as any); setButtonVariant(e.target.value==="Incident Critique"?"danger":"primary")}}
+                onChange={(e) => {setCategory(e.target.value as TicketCategory); setButtonVariant(e.target.value==="Incident Critique"?"danger":"primary")}}
                 options={[
                   { value: 'Incident Critique', label: 'Incident Critique (Panne, Dégradation)' },
                   { value: 'Évolution', label: 'Évolution (Ajout de ressources, Modification)' },

src/components/widgets/TicketChatWidget.tsx

@@ -28,7 +28,7 @@ export const TicketChatWidget: React.FC<TicketChatWidgetProps> = ({
     try {
       await onSendMessage(newMessage);
       setNewMessage(''); // Vide l'input uniquement si l'envoi réussit
-    } catch (err) {
+    } catch {
       alert("Erreur lors de l'envoi.");
     }
   };

src/hooks/useDocuments.ts

@@ -24,6 +24,7 @@ export const useDocuments = () => {
   }, []);
 
   useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     fetchDocuments();
   }, [fetchDocuments]);
 

src/hooks/useInfrastructureNodes.ts

@@ -15,7 +15,7 @@ export const useInfrastructureNodes = () => {
           sort: 'created',
         });
         setNodes(records);
-      } catch (err) {
+      } catch {
         setError("Impossible de charger l'infrastructure.");
       } finally {
         setIsLoading(false);

src/hooks/useLoginFlow.ts

@@ -23,8 +23,7 @@ export const useLoginFlow = (onLoginSuccess: () => void) => {
     try {
       const authData = await pb.collection('aegis_users').authWithOAuth2({ provider: 'oidc' });
       if (authData) onLoginSuccess();
-    } catch (err) {
+    } catch {
-      console.error(err);
       setError("Échec de la connexion via GISE Identity.");
       pb.authStore.clear();
     } finally {
@@ -64,7 +63,7 @@ export const useLoginFlow = (onLoginSuccess: () => void) => {
       } else {
         onLoginSuccess();
       }
-    } catch (err) {
+    } catch {
       setError("Identifiants incorrects ou accès révoqué.");
       pb.authStore.clear();
     } finally {
@@ -98,7 +97,7 @@ export const useLoginFlow = (onLoginSuccess: () => void) => {
       } else {
         setError("Code de sécurité invalide ou expiré.");
       }
-    } catch (err) {
+    } catch {
       setError("Erreur critique lors de la vérification.");
     } finally {
       setIsLoading(false);

src/hooks/useTicketDetail.ts

@@ -37,6 +37,7 @@ export const useTicketDetail = (ticketId?: string) => {
   }, [ticketId]);
 
   useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     fetchTicketData();
   }, [fetchTicketData]);
 
@@ -51,9 +52,8 @@ export const useTicketDetail = (ticketId?: string) => {
         content: content.trim(),
       });
       await fetchTicketData(); // On recharge les messages après l'envoi
-    } catch (err) {
+    } catch (error) {
-      console.error("Erreur lors de l'envoi du message :", err);
+      throw new Error("Impossible de charger le ticket", { cause: error });
-      throw new Error("Impossible d'envoyer le message.");
     } finally {
       setIsSending(false);
     }

src/hooks/useTickets.ts

@@ -24,6 +24,7 @@ export const useTickets = () => {
   }, []);
 
   useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     fetchTickets();
   }, [fetchTickets]);
 

src/pages/trustcenter/InfrastructureEvolution.tsx

@@ -6,7 +6,6 @@ import { useEvolutionRequest } from '@/hooks/useEvolutionRequest';
 
 import { BackButton } from '@/components/ui/BackButton';
 import { EmptyState } from '@/components/ui/EmptyState';
-import { Button } from '@/components/ui/Button';
 
 // Nos nouveaux composants
 import { EvolutionOptionCard } from '@/components/widgets/EvolutionOptionCard';

src/styles/VariantStyle.ts

@@ -0,0 +1 @@
+export type ButtonVariantStyle = "primary" | "danger" | "secondary" | "success" | "outline" | "ghost";

src/types/Category.ts

@@ -0,0 +1 @@
+export type TicketCategory = "Incident Critique" | "Évolution" | "Administratif";