Merge pull request #837 from Sim-sat/no-explicit-any-pages

fix(lint): fix remaining no-explicit-any errors

Author: CodeWithCJ

SparkyFitnessFrontend/src/api/Auth/auth.ts

@@ -1,21 +1,17 @@
 import { authClient } from '@/lib/auth-client';
-import type { AccessibleUser, AuthResponse, LoginSettings } from '@/types/auth';
+import type {
+  AccessibleUser,
+  AuthResponse,
+  BetterAuthUser,
+  LoginSettings,
+} from '@/types/auth';
 import { apiCall } from '../api';
 
 interface AuthError extends Error {
   code?: string;
   status?: number;
 }
 
-interface BetterAuthUser {
-  id: string;
-  email: string;
-  name: string;
-  role?: string;
-  twoFactorEnabled?: boolean;
-  mfaEmailEnabled?: boolean;
-}
-
 interface BetterAuthResponse {
   user: BetterAuthUser;
   twoFactorRedirect?: boolean;

SparkyFitnessFrontend/src/api/Exercises/exerciseEntryService.ts

@@ -4,40 +4,9 @@ import type { WorkoutPresetSet } from '@/types/workout';
 import { debug } from '@/utils/logging';
 import { getUserLoggingLevel } from '@/utils/userPreferences';
 import type { ExerciseEntry } from '@/types/diary';
-import type { GroupedExerciseEntry } from '@/types/exercises';
+import type { GroupedExerciseEntry, LapDTO } from '@/types/exercises';
 import type { ExerciseProgressData } from '@/types/reports';
-
-interface RawActivityDetail {
-  id?: string;
-  detail_type: string;
-  detail_data: unknown;
-  provider_name?: string;
-}
-
-interface RawExerciseSnapshot {
-  equipment?: string;
-  primary_muscles?: string;
-  secondary_muscles?: string;
-  instructions?: string;
-  images?: string;
-  [key: string]: unknown;
-}
-
-interface RawExercise {
-  sets?: string | unknown[];
-  exercise_snapshot?: RawExerciseSnapshot;
-  activity_details?: RawActivityDetail[];
-  [key: string]: unknown;
-}
-
-interface RawGroupedEntry {
-  type?: string;
-  exercises?: RawExercise[];
-  sets?: string | unknown[];
-  exercise_snapshot?: RawExerciseSnapshot;
-  activity_details?: RawActivityDetail[];
-  [key: string]: unknown;
-}
+import { ActivityDetailMetric } from '@/pages/Reports/ActivityReportVisualizer';
 
 export const getExerciseEntriesForDate = async (
   date: string
@@ -83,7 +52,7 @@ export const fetchExerciseEntries = async (
                     value:
                       typeof detail.detail_data === 'object'
                         ? JSON.stringify(detail.detail_data, null, 2)
-                        : detail.detail_data,
+                        : String(detail.detail_data),
                     provider_name: detail.provider_name,
                     detail_type: detail.detail_type,
                   }))
@@ -114,7 +83,7 @@ export const fetchExerciseEntries = async (
               value:
                 typeof detail.detail_data === 'object'
                   ? JSON.stringify(detail.detail_data, null, 2)
-                  : detail.detail_data,
+                  : String(detail.detail_data),
               provider_name: detail.provider_name,
               detail_type: detail.detail_type,
             }))
@@ -327,15 +296,15 @@ export interface ActivityDetailsResponse {
   activity?: {
     details?: {
       metricDescriptors?: unknown[];
-      activityDetailMetrics?: unknown[];
+      activityDetailMetrics?: ActivityDetailMetric[];
       geoPolylineDTO?: {
         polyline: { lat: number; lon: number }[];
       };
       [key: string]: unknown;
     };
     hr_in_timezones?: unknown[];
     splits?: {
-      lapDTOs: unknown[];
+      lapDTOs: LapDTO[];
       [key: string]: unknown;
     };
     activity?: {

SparkyFitnessFrontend/src/api/Foods/usda.ts

@@ -1,82 +1,11 @@
 import { apiCall } from '@/api/api';
+import {
+  RawUsdaNutrient,
+  UsdaFoodDetails,
+  UsdaFoodSearchItem,
+  UsdaNutrientMap,
+} from '@/types/exercises';
 
-interface UsdaFoodSearchItem {
-  fdcId: number;
-  description: string;
-  brandOwner?: string;
-  dataType: string;
-  foodCategory: string;
-  publicationDate: string;
-  foodNutrients: UsdaFoodNutrient[];
-  servingSize?: number;
-  servingSizeUnit?: string;
-}
-
-interface UsdaFoodNutrient {
-  nutrientId: number;
-  nutrientName: string;
-  nutrientNumber: string;
-  unitName: string;
-  value: number;
-}
-
-interface UsdaFoodDetails {
-  fdcId: number;
-  description: string;
-  brandOwner?: string;
-  servingSize?: number;
-  servingSizeUnit?: string;
-  calories: number;
-  protein: number;
-  fat: number;
-  carbohydrates: number;
-  sugars?: number;
-  fiber?: number;
-  sodium?: number;
-  cholesterol?: number;
-  saturatedFat?: number;
-  transFat?: number;
-  monounsaturatedFat?: number;
-  polyunsaturatedFat?: number;
-  potassium?: number;
-  vitaminA?: number;
-  vitaminC?: number;
-  calcium?: number;
-  iron?: number;
-}
-
-interface RawUsdaNutrient {
-  nutrient?: {
-    id?: number;
-    name?: string;
-    unitName?: string;
-  };
-  nutrientName?: string;
-  nutrientId?: number;
-  unitName?: string;
-  amount?: number;
-  value?: number;
-}
-
-interface NutrientMap {
-  calories?: number;
-  protein?: number;
-  fat?: number;
-  carbohydrates?: number;
-  sugars?: number;
-  fiber?: number;
-  sodium?: number;
-  cholesterol?: number;
-  saturatedFat?: number;
-  transFat?: number;
-  monounsaturatedFat?: number;
-  polyunsaturatedFat?: number;
-  potassium?: number;
-  vitaminA?: number;
-  vitaminC?: number;
-  calcium?: number;
-  iron?: number;
-}
 export const searchUsdaFoods = async (
   query: string,
   providerId: string,
@@ -107,7 +36,7 @@ export const getUsdaFoodDetails = async (
 
     if (!response) return null;
 
-    const nutrientMap: NutrientMap = {};
+    const nutrientMap: UsdaNutrientMap = {};
     if (response.foodNutrients) {
       response.foodNutrients.forEach((n: RawUsdaNutrient) => {
         // USDA returns various spellings, try to normalize or check multiple

SparkyFitnessFrontend/src/api/api.ts

@@ -16,11 +16,11 @@ interface ApiCallOptions extends RequestInit {
 export const API_BASE_URL = '/api';
 //export const API_BASE_URL = 'http://192.168.1.111:3010';
 
-export async function apiCall(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function apiCall<T = any>(
   endpoint: string,
   options?: ApiCallOptions
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): Promise<any> {
+): Promise<T> {
   const userLoggingLevel = getUserLoggingLevel();
   let url = options?.externalApi ? endpoint : `${API_BASE_URL}${endpoint}`;
 
@@ -118,7 +118,7 @@ export async function apiCall(
           userLoggingLevel,
           `Frontend workaround triggered for ${endpoint}: Backend returned 400. Returning empty array.`
         );
-        return []; // Return empty array to gracefully handle 400 errors on these endpoints
+        return [] as unknown as T; // Return empty array to gracefully handle 400 errors on these endpoints
       }
 
       // Special handling for 404 errors on exercise search endpoints
@@ -130,7 +130,7 @@ export async function apiCall(
           userLoggingLevel,
           `Frontend workaround triggered for ${endpoint}: Backend returned 404. Returning empty array.`
         );
-        return []; // Return empty array to gracefully handle 404 errors on exercise search
+        return [] as unknown as T; // Return empty array to gracefully handle 404 errors on exercise search
       }
 
       // Suppress toast for 404 errors if suppress404Toast is true
@@ -163,7 +163,7 @@ export async function apiCall(
         userLoggingLevel,
         `API Call: Received blob response from ${url}.`
       );
-      return blobResponse;
+      return blobResponse as unknown as T;
     }
     // Handle cases where the response might be empty (e.g., DELETE requests)
     const text = await response.text();

SparkyFitnessFrontend/src/components/FoodSearch/FoodSearch.tsx

@@ -49,6 +49,7 @@ import {
   convertNutritionixToFood,
   convertOpenFoodFactsToFood,
   convertUsdaToFood,
+  mapUsdaItemToDetails,
 } from '@/utils/foodSearch.ts';
 import FoodResultCard from './FoodResultCard.tsx';
 import { BarcodeScannerDialog } from './BarcodeScannerDialog.tsx';
@@ -116,7 +117,7 @@ export interface NutritionixItem {
   glycemic_index?: GlycemicIndex;
 }
 
-interface UsdaItem {
+export interface UsdaItem {
   fdcId: number;
   description: string;
   brandOwner?: string;
@@ -157,6 +158,7 @@ const EnhancedFoodSearch = ({
     convertEnergy,
     getEnergyUnitString,
     autoScaleOpenFoodFactsImports,
+    loggingLevel,
   } = usePreferences();
   const isMobile = useIsMobile();
   const platform = isMobile ? 'mobile' : 'desktop';
@@ -354,7 +356,7 @@ const EnhancedFoodSearch = ({
         data.map((item) => ({
           provider_type: 'fatsecret',
           raw: item,
-          food: convertFatSecretToFood(item, item),
+          food: convertFatSecretToFood(item),
         }))
       );
     },
@@ -366,7 +368,10 @@ const EnhancedFoodSearch = ({
         data.map((item) => ({
           provider_type: 'usda',
           raw: item,
-          food: convertUsdaToFood(item, item),
+          food: convertUsdaToFood(
+            item,
+            mapUsdaItemToDetails(item, loggingLevel)
+          ),
         }))
       );
     },

SparkyFitnessFrontend/src/components/Onboarding/NutrientGoals.tsx

@@ -519,7 +519,7 @@ export const NutrientGoals = ({
                       <Input
                         type="number"
                         step={0.1}
-                        value={(editedPlan?.[cn.name] ?? 0).toFixed(1)}
+                        value={Number(editedPlan?.[cn.name] ?? 0).toFixed(1)}
                         onChange={(e) =>
                           setEditedPlan((prev) =>
                             prev

SparkyFitnessFrontend/src/hooks/Admin/useBackups.ts

@@ -27,27 +27,42 @@ export const useBackupSettings = () => {
 
 export const useUpdateBackupSettings = () => {
   const queryClient = useQueryClient();
+  const { t } = useTranslation();
   return useMutation({
     mutationFn: (data: Partial<BackupSettingsResponse>) =>
       saveBackupSettings(data),
     onSuccess: () => {
       return queryClient.invalidateQueries({ queryKey: backupKeys.all });
     },
+    meta: {
+      successMessage: t('admin.backupSettings.backupSettingsSaved', 'Saved'),
+      errorMessage: t('error', 'Error'),
+    },
   });
 };
 
 export const useTriggerManualBackup = () => {
   const queryClient = useQueryClient();
+
   return useMutation({
     mutationFn: triggerManualBackup,
     onSuccess: () => {
       return queryClient.invalidateQueries({ queryKey: backupKeys.all });
     },
+    meta: {
+      successMessage: (_data, variables) => {
+        const typedVars = variables as { message: string };
+        return typedVars.message ? typedVars.message : 'Backup done';
+      },
+    },
   });
 };
 
 export const useRestoreBackup = () => {
   return useMutation({
     mutationFn: restoreBackup,
+    meta: {
+      successMessage: 'Restored. Logging out..',
+    },
   });
 };