feat: integrate UserPreferencesContext for improved preference management

- Added `UserPreferencesProvider` to `RootLayout` for centralized user preferences handling. - Updated components to remove direct user preferences fetching, relying on context instead. - Enhanced SSR data fetching by consolidating user preferences retrieval into a single service call. - Cleaned up unused props in various components to streamline the codebase.
2025-09-21 15:03:19 +02:00
parent 4ba6ba2c0b
commit c650c67627
17 changed files with 86 additions and 138 deletions
--- a/src/components/HomePageClient.tsx
+++ b/src/components/HomePageClient.tsx
@@ -2,8 +2,7 @@

 import { Header } from '@/components/ui/Header';
 import { TasksProvider, useTasksContext } from '@/contexts/TasksContext';
-import { UserPreferencesProvider } from '@/contexts/UserPreferencesContext';
-import { Task, Tag, UserPreferences, TaskStats } from '@/lib/types';
+import { Task, Tag, TaskStats } from '@/lib/types';
 import { CreateTaskData } from '@/clients/tasks-client';
 import { DashboardStats } from '@/components/dashboard/DashboardStats';
 import { QuickActions } from '@/components/dashboard/QuickActions';
@@ -13,7 +12,6 @@ import { ProductivityAnalytics } from '@/components/dashboard/ProductivityAnalyt
 interface HomePageClientProps {
  initialTasks: Task[];
  initialTags: (Tag & { usage: number })[];
-  initialPreferences: UserPreferences;
  initialStats: TaskStats;
 }

@@ -51,16 +49,14 @@ function HomePageContent() {
  );
 }

-export function HomePageClient({ initialTasks, initialTags, initialPreferences, initialStats }: HomePageClientProps) {
+export function HomePageClient({ initialTasks, initialTags, initialStats }: HomePageClientProps) {
  return (
-    <UserPreferencesProvider initialPreferences={initialPreferences}>
-      <TasksProvider 
-        initialTasks={initialTasks}
-        initialTags={initialTags}
-        initialStats={initialStats}
-      >
-        <HomePageContent />
-      </TasksProvider>
-    </UserPreferencesProvider>
+    <TasksProvider 
+      initialTasks={initialTasks}
+      initialTags={initialTags}
+      initialStats={initialStats}
+    >
+      <HomePageContent />
+    </TasksProvider>
  );
 }
--- a/src/components/settings/AdvancedSettingsPageClient.tsx
+++ b/src/components/settings/AdvancedSettingsPageClient.tsx
@@ -1,11 +1,9 @@
 'use client';

 import { useState } from 'react';
-import { UserPreferences } from '@/lib/types';
 import { Header } from '@/components/ui/Header';
 import { Card, CardHeader, CardContent } from '@/components/ui/Card';
 import { Button } from '@/components/ui/Button';
-import { UserPreferencesProvider } from '@/contexts/UserPreferencesContext';
 import { backupClient, BackupListResponse } from '@/clients/backup-client';
 import Link from 'next/link';
 import { parseDate, getToday, formatDateForDisplay } from '@/lib/date-utils';
@@ -17,13 +15,11 @@ interface DatabaseStats {
 }

 interface AdvancedSettingsPageClientProps {
-  initialPreferences: UserPreferences;
  initialDbStats: DatabaseStats;
  initialBackupData: BackupListResponse;
 }

 export function AdvancedSettingsPageClient({ 
-  initialPreferences, 
  initialDbStats, 
  initialBackupData 
 }: AdvancedSettingsPageClientProps) {
@@ -107,8 +103,7 @@ export function AdvancedSettingsPageClient({
  };

  return (
-    <UserPreferencesProvider initialPreferences={initialPreferences}>
-      <div className="min-h-screen bg-[var(--background)]">
+    <div className="min-h-screen bg-[var(--background)]">
        <Header 
          title="TowerControl"
          subtitle="Paramètres avancés"
@@ -251,6 +246,5 @@ export function AdvancedSettingsPageClient({
          </div>
        </div>
      </div>
-    </UserPreferencesProvider>
  );
 }
--- a/src/components/settings/GeneralSettingsPageClient.tsx
+++ b/src/components/settings/GeneralSettingsPageClient.tsx
@@ -1,23 +1,21 @@
 'use client';

 import { useState, useMemo } from 'react';
-import { UserPreferences, Tag } from '@/lib/types';
+import { Tag } from '@/lib/types';
 import { useTags } from '@/hooks/useTags';
 import { Header } from '@/components/ui/Header';
 import { Card, CardContent, CardHeader } from '@/components/ui/Card';
 import { Button } from '@/components/ui/Button';
 import { Input } from '@/components/ui/Input';
 import { TagForm } from '@/components/forms/TagForm';
-import { UserPreferencesProvider } from '@/contexts/UserPreferencesContext';
 import Link from 'next/link';
 import { formatDateForDisplay } from '@/lib/date-utils';

 interface GeneralSettingsPageClientProps {
-  initialPreferences: UserPreferences;
  initialTags: Tag[];
 }

-export function GeneralSettingsPageClient({ initialPreferences, initialTags }: GeneralSettingsPageClientProps) {
+export function GeneralSettingsPageClient({ initialTags }: GeneralSettingsPageClientProps) {
  const { 
    tags, 
    refreshTags,
@@ -82,8 +80,7 @@ export function GeneralSettingsPageClient({ initialPreferences, initialTags }: G
    }
  };
  return (
-    <UserPreferencesProvider initialPreferences={initialPreferences}>
-      <div className="min-h-screen bg-[var(--background)]">
+    <div className="min-h-screen bg-[var(--background)]">
        <Header 
          title="TowerControl"
          subtitle="Paramètres généraux"
@@ -332,31 +329,30 @@ export function GeneralSettingsPageClient({ initialPreferences, initialTags }: G
            </div>
          </div>
        </div>
-      </div>

-      {/* Modals pour les tags */}
-      {isCreateModalOpen && (
-        <TagForm
-          isOpen={isCreateModalOpen}
-          onClose={() => setIsCreateModalOpen(false)}
-          onSuccess={async () => {
-            setIsCreateModalOpen(false);
-            await refreshTags();
-          }}
-        />
-      )}
-      
-      {editingTag && (
-        <TagForm
-          isOpen={!!editingTag}
-          tag={editingTag}
-          onClose={() => setEditingTag(null)}
-          onSuccess={async () => {
-            setEditingTag(null);
-            await refreshTags();
-          }}
-        />
-      )}
-    </UserPreferencesProvider>
+        {/* Modals pour les tags */}
+        {isCreateModalOpen && (
+          <TagForm
+            isOpen={isCreateModalOpen}
+            onClose={() => setIsCreateModalOpen(false)}
+            onSuccess={async () => {
+              setIsCreateModalOpen(false);
+              await refreshTags();
+            }}
+          />
+        )}
+        
+        {editingTag && (
+          <TagForm
+            isOpen={!!editingTag}
+            tag={editingTag}
+            onClose={() => setEditingTag(null)}
+            onSuccess={async () => {
+              setEditingTag(null);
+              await refreshTags();
+            }}
+          />
+        )}
+      </div>
  );
 }
--- a/src/components/settings/IntegrationsSettingsPageClient.tsx
+++ b/src/components/settings/IntegrationsSettingsPageClient.tsx
@@ -1,27 +1,23 @@
 'use client';

-import { UserPreferences, JiraConfig } from '@/lib/types';
+import { JiraConfig } from '@/lib/types';
 import { Header } from '@/components/ui/Header';
 import { Card, CardHeader, CardContent } from '@/components/ui/Card';
 import { JiraConfigForm } from '@/components/settings/JiraConfigForm';
 import { JiraSync } from '@/components/jira/JiraSync';
 import { JiraLogs } from '@/components/jira/JiraLogs';
 import { JiraSchedulerConfig } from '@/components/jira/JiraSchedulerConfig';
-import { UserPreferencesProvider } from '@/contexts/UserPreferencesContext';
 import Link from 'next/link';

 interface IntegrationsSettingsPageClientProps {
-  initialPreferences: UserPreferences;
  initialJiraConfig: JiraConfig;
 }

 export function IntegrationsSettingsPageClient({ 
-  initialPreferences, 
  initialJiraConfig 
 }: IntegrationsSettingsPageClientProps) {
  return (
-    <UserPreferencesProvider initialPreferences={initialPreferences}>
-      <div className="min-h-screen bg-[var(--background)]">
+    <div className="min-h-screen bg-[var(--background)]">
        <Header 
          title="TowerControl"
          subtitle="Intégrations externes"
@@ -169,6 +165,5 @@ export function IntegrationsSettingsPageClient({
          </div>
        </div>
      </div>
-    </UserPreferencesProvider>
  );
 }
--- a/src/components/settings/SettingsIndexPageClient.tsx
+++ b/src/components/settings/SettingsIndexPageClient.tsx
@@ -1,9 +1,8 @@
 'use client';

-import { UserPreferences } from '@/lib/types';
 import { Header } from '@/components/ui/Header';
 import { Card, CardHeader, CardContent } from '@/components/ui/Card';
-import { UserPreferencesProvider } from '@/contexts/UserPreferencesContext';
+import { useUserPreferences } from '@/contexts/UserPreferencesContext';
 import Link from 'next/link';
 import { useState, useEffect, useTransition } from 'react';
 import { backupClient } from '@/clients/backup-client';
@@ -12,11 +11,11 @@ import { getSystemInfo } from '@/actions/system-info';
 import { SystemInfo } from '@/services/system-info';

 interface SettingsIndexPageClientProps {
-  initialPreferences: UserPreferences;
  initialSystemInfo?: SystemInfo;
 }

-export function SettingsIndexPageClient({ initialPreferences, initialSystemInfo }: SettingsIndexPageClientProps) {
+export function SettingsIndexPageClient({ initialSystemInfo }: SettingsIndexPageClientProps) {
+  const { preferences } = useUserPreferences();
  // États pour les actions
  const [isBackupLoading, setIsBackupLoading] = useState(false);
  const [isJiraTestLoading, setIsJiraTestLoading] = useState(false);
@@ -140,8 +139,7 @@ export function SettingsIndexPageClient({ initialPreferences, initialSystemInfo
  ];

  return (
-    <UserPreferencesProvider initialPreferences={initialPreferences}>
-      <div className="min-h-screen bg-[var(--background)]">
+    <div className="min-h-screen bg-[var(--background)]">
        <Header 
          title="TowerControl"
          subtitle="Configuration & Paramètres"
@@ -167,7 +165,7 @@ export function SettingsIndexPageClient({ initialPreferences, initialSystemInfo
                    <span className="text-2xl">🎨</span>
                    <div>
                      <p className="text-sm text-[var(--muted-foreground)]">Thème actuel</p>
-                      <p className="font-medium capitalize">{initialPreferences.viewPreferences.theme}</p>
+                      <p className="font-medium capitalize">{preferences.viewPreferences.theme}</p>
                    </div>
                  </div>
                </CardContent>
@@ -181,9 +179,9 @@ export function SettingsIndexPageClient({ initialPreferences, initialSystemInfo
                      <p className="text-sm text-[var(--muted-foreground)]">Jira</p>
                      <div className="flex items-center gap-2">
                        <p className="font-medium">
-                          {initialPreferences.jiraConfig.enabled ? 'Configuré' : 'Non configuré'}
+                          {preferences.jiraConfig.enabled ? 'Configuré' : 'Non configuré'}
                        </p>
-                        {initialPreferences.jiraConfig.enabled && (
+                        {preferences.jiraConfig.enabled && (
                          <span className="w-2 h-2 bg-green-500 rounded-full" title="Jira configuré"></span>
                        )}
                      </div>
@@ -198,7 +196,7 @@ export function SettingsIndexPageClient({ initialPreferences, initialSystemInfo
                    <span className="text-2xl">📏</span>
                    <div>
                      <p className="text-sm text-[var(--muted-foreground)]">Taille police</p>
-                      <p className="font-medium capitalize">{initialPreferences.viewPreferences.fontSize}</p>
+                      <p className="font-medium capitalize">{preferences.viewPreferences.fontSize}</p>
                    </div>
                  </div>
                </CardContent>
@@ -325,7 +323,7 @@ export function SettingsIndexPageClient({ initialPreferences, initialSystemInfo
                      </div>
                      <button 
                        onClick={handleTestJira}
-                        disabled={!initialPreferences.jiraConfig.enabled || isJiraTestLoading}
+                        disabled={!preferences.jiraConfig.enabled || isJiraTestLoading}
                        className="px-3 py-1.5 bg-[var(--card)] text-[var(--foreground)] border border-[var(--border)] rounded text-sm disabled:opacity-50 disabled:cursor-not-allowed"
                      >
                        {isJiraTestLoading ? 'Test...' : 'Tester'}
@@ -404,6 +402,5 @@ export function SettingsIndexPageClient({ initialPreferences, initialSystemInfo
          </div>
        </div>
      </div>
-    </UserPreferencesProvider>
  );
 }