Merge pull request #832 from Sim-sat/no-explicit-any-diary

fix(lint): no-explicit-any Diary, Exercises, Foods, Settings

Author: CodeWithCJ

SparkyFitnessFrontend/src/api/Diary/foodEntryService.ts

@@ -2,7 +2,7 @@ import { apiCall } from '../api';
 import type { MealFood } from '@/types/meal';
 import type { FoodEntryMeal } from '@/types/meal';
 import type { FoodEntry } from '@/types/food';
-import { DayData } from '@/types/diary';
+import { DayData, Goals } from '@/types/diary';
 
 export interface FoodEntryUpdateData {
   quantity?: number;
@@ -22,8 +22,7 @@ export interface FoodEntryCreateData {
 export const updateFoodEntry = async (
   id: string,
   data: FoodEntryUpdateData
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): Promise<any> => {
+): Promise<unknown> => {
   const response = await apiCall(`/food-entries/${id}`, {
     method: 'PUT',
     body: data,
@@ -53,17 +52,15 @@ export const loadMiniNutritionTrendData = async (
 
 export const createFoodEntry = async (
   data: FoodEntryCreateData
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): Promise<any> => {
+): Promise<unknown> => {
   const response = await apiCall('/food-entries', {
     method: 'POST',
     body: data,
   });
   return response;
 };
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const removeFoodEntry = async (id: string): Promise<any> => {
+export const removeFoodEntry = async (id: string): Promise<void> => {
   const response = await apiCall(`/food-entries/${id}`, {
     method: 'DELETE',
   });
@@ -77,8 +74,7 @@ export const loadFoodEntries = async (date: string): Promise<FoodEntry[]> => {
   return response;
 };
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const loadDiaryGoals = async (date: string): Promise<any> => {
+export const loadDiaryGoals = async (date: string): Promise<Goals> => {
   // Adjust return type as needed
   const response = await apiCall(`/goals/by-date/${date}`, {
     method: 'GET',
@@ -173,8 +169,7 @@ export const getFoodEntryMealsByDate = async (
 
 export const deleteFoodEntryMeal = async (
   foodEntryMealId: string
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): Promise<any> => {
+): Promise<unknown> => {
   const response = await apiCall(`/food-entry-meals/${foodEntryMealId}`, {
     method: 'DELETE',
   });

SparkyFitnessFrontend/src/api/Diary/mealTypeService.ts

@@ -37,8 +37,7 @@ export const updateMealType = async (
   return response;
 };
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const deleteMealType = async (id: string): Promise<any> => {
+export const deleteMealType = async (id: string): Promise<unknown> => {
   const response = await apiCall(`/meal-types/${id}`, {
     method: 'DELETE',
   });

SparkyFitnessFrontend/src/api/Exercises/exerciseEntryService.ts

@@ -7,6 +7,38 @@ import type { ExerciseEntry } from '@/types/diary';
 import type { GroupedExerciseEntry } 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;
+}
+
 export const getExerciseEntriesForDate = async (
   date: string
 ): Promise<GroupedExerciseEntry[]> => {
@@ -24,16 +56,14 @@ export const fetchExerciseEntries = async (
   const loggingLevel = getUserLoggingLevel();
   const response = await getExerciseEntriesForDate(selectedDate);
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const parsedEntries: GroupedExerciseEntry[] = response.map((entry: any) => {
+  const parsedEntries: GroupedExerciseEntry[] = response.map((entry) => {
     if (entry.type === 'preset') {
       return {
-        ...entry,
+        ...(entry as unknown as GroupedExerciseEntry),
         exercises: entry.exercises
-          ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            entry.exercises.map((ex: any) => ({
+          ? entry.exercises.map((ex) => ({
               ...ex,
-              sets: ex.sets ? parseJsonArray(ex.sets) : [], // Parse sets if it's a JSON string
+              sets: ex.sets ? ex.sets : [], // Parse sets if it's a JSON string
               exercise_snapshot: {
                 ...ex.exercise_snapshot, // Use the existing snapshot
                 equipment: parseJsonArray(ex.exercise_snapshot.equipment),
@@ -47,8 +77,7 @@ export const fetchExerciseEntries = async (
                 images: parseJsonArray(ex.exercise_snapshot.images),
               },
               activity_details: ex.activity_details
-                ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                  ex.activity_details.map((detail: any) => ({
+                ? ex.activity_details.map((detail) => ({
                     id: detail.id,
                     key: detail.detail_type,
                     value:
@@ -65,7 +94,7 @@ export const fetchExerciseEntries = async (
     } else {
       return {
         ...entry,
-        sets: entry.sets ? parseJsonArray(entry.sets) : [], // Parse sets if it's a JSON string
+        sets: entry.sets ? entry.sets : [], // Parse sets if it's a JSON string
         exercise_snapshot: {
           ...entry.exercise_snapshot, // Use the existing snapshot
           equipment: parseJsonArray(entry.exercise_snapshot.equipment),
@@ -79,8 +108,7 @@ export const fetchExerciseEntries = async (
           images: parseJsonArray(entry.exercise_snapshot.images),
         },
         activity_details: entry.activity_details
-          ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            entry.activity_details.map((detail: any) => ({
+          ? entry.activity_details.map((detail) => ({
               id: detail.id,
               key: detail.detail_type,
               value:
@@ -127,8 +155,7 @@ export const createExerciseEntry = async (payload: {
 
     // Append other data from the payload to formData
     Object.keys(entryData).forEach((key) => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const value = (entryData as any)[key];
+      const value = entryData[key];
       if (value !== undefined && value !== null) {
         if (key === 'sets' && Array.isArray(value)) {
           // The backend expects 'sets' to be a JSON string if it's part of FormData
@@ -215,8 +242,7 @@ export const updateExerciseEntry = async (
     formData.append('image', imageFile);
 
     Object.keys(entryData).forEach((key) => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const value = (entryData as any)[key];
+      const value = entryData[key];
       if (value !== undefined && value !== null) {
         if (key === 'sets' && Array.isArray(value)) {
           formData.append(key, JSON.stringify(value));
@@ -298,8 +324,41 @@ export const fetchExerciseDetails = async (
 
 export interface ActivityDetailsResponse {
   id?: string;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  [key: string]: any;
+  activity?: {
+    details?: {
+      metricDescriptors?: unknown[];
+      activityDetailMetrics?: unknown[];
+      geoPolylineDTO?: {
+        polyline: { lat: number; lon: number }[];
+      };
+      [key: string]: unknown;
+    };
+    hr_in_timezones?: unknown[];
+    splits?: {
+      lapDTOs: unknown[];
+      [key: string]: unknown;
+    };
+    activity?: {
+      duration?: number;
+      calories?: number;
+      totalAscent?: number;
+      averageHR?: number;
+      averageRunCadence?: number;
+      distance?: number;
+      averagePace?: number;
+      activityName?: string;
+      eventType?: unknown;
+      course?: unknown;
+      gear?: unknown;
+      [key: string]: unknown;
+    };
+    [key: string]: unknown;
+  };
+  workout?: {
+    workoutName: string;
+    [key: string]: unknown;
+  };
+  [key: string]: unknown;
 }
 
 export const getActivityDetails = async (

SparkyFitnessFrontend/src/api/Exercises/exerciseSearchService.ts

@@ -6,8 +6,7 @@ export const searchExercises = async (
   equipmentFilter: string[] = [],
   muscleGroupFilter: string[] = []
 ): Promise<Exercise[]> => {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const params: Record<string, any> = {
+  const params: Record<string, string> = {
     searchTerm: query,
   };
   if (equipmentFilter.length > 0) {
@@ -31,8 +30,7 @@ export const searchExternalExercises = async (
   muscleGroupFilter: string[] = [],
   limit?: number
 ): Promise<Exercise[]> => {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const params: Record<string, any> = {
+  const params: Record<string, string | number> = {
     query: query,
     providerId: providerId,
     providerType: providerType,

SparkyFitnessFrontend/src/api/Exercises/exerciseService.ts

@@ -96,8 +96,7 @@ export const loadExercises = async (
     method: 'GET',
   });
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const parsedExercises = response.exercises.map((exercise: any) => ({
+  const parsedExercises = response.exercises.map((exercise: Exercise) => ({
     ...exercise,
     equipment: parseJsonArray(exercise.equipment),
     primary_muscles: parseJsonArray(exercise.primary_muscles),
@@ -229,8 +228,7 @@ export const importExercisesFromCSV = async (
   created: number;
   updated: number;
   failed: number;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  failedRows: any[];
+  failedRows: unknown[];
 }> => {
   return apiCall('/exercises/import', {
     method: 'POST',

SparkyFitnessFrontend/src/api/Exercises/freeExerciseDB.ts

@@ -1,8 +1,7 @@
 import { debug, error } from '@/utils/logging';
 import { getUserLoggingLevel } from '@/utils/userPreferences';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let cachedSchema: any = null;
+let cachedSchema: unknown = null;
 
 const GITHUB_RAW_BASE_URL =
   'https://raw.githubusercontent.com/yuhonas/free-exercise-db/main';

SparkyFitnessFrontend/src/api/Exercises/workoutPresets.ts

@@ -50,8 +50,7 @@ export const searchWorkoutPresets = async (
   searchTerm: string,
   limit?: number
 ): Promise<WorkoutPreset[]> => {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const params: Record<string, any> = { searchTerm };
+  const params: Record<string, string | number> = { searchTerm };
   if (limit !== undefined) {
     params.limit = limit;
   }

SparkyFitnessFrontend/src/api/Foods/mealPlanTemplate.ts

@@ -13,8 +13,7 @@ export const createMealPlanTemplate = async (
   currentClientDate?: string
 ): Promise<MealPlanTemplate> => {
   // rename assignments to day_presets because of backend inconsistencies
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const { assignments, ...restData } = templateData as any;
+  const { assignments, ...restData } = templateData;
   return await api.post('/meal-plan-templates', {
     body: {
       ...restData,

SparkyFitnessFrontend/src/api/Foods/meals.ts

@@ -16,8 +16,7 @@ export const getMeals = async (
   searchTerm: string = ''
 ): Promise<Meal[]> => {
   let url = `/meals`;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const params: { [key: string]: any } = { filter };
+  const params: { [key: string]: string } = { filter };
 
   if (searchTerm) {
     url = `/meals/search`;
@@ -88,17 +87,6 @@ export const deleteMealPlanEntry = async (planId: string): Promise<void> => {
   await apiCall(`/meals/plan/${planId}`, { method: 'DELETE' });
 };
 
-export const logMealPlanEntryToDiary = async (
-  mealPlanId: string,
-  targetDate?: string
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): Promise<any[]> => {
-  return await apiCall(`/meals/plan/${mealPlanId}/log-to-diary`, {
-    method: 'POST',
-    body: { target_date: targetDate },
-  });
-};
-
 export const createMealFromDiary = async (
   date: string,
   mealType: string,

SparkyFitnessFrontend/src/api/Foods/nutrionix.ts

@@ -1,6 +1,27 @@
 import { toast } from '@/hooks/use-toast';
 import { apiCall } from '@/api/api';
 
+interface NutritionixFood {
+  food_name: string;
+  brand_name?: string | null;
+  nf_calories: number;
+  nf_protein: number;
+  nf_total_carbohydrate: number;
+  nf_total_fat: number;
+  nf_saturated_fat: number;
+  nf_cholesterol: number;
+  nf_sodium: number;
+  nf_potassium: number;
+  nf_dietary_fiber: number;
+  nf_sugars: number;
+  serving_qty: number;
+  serving_unit: string;
+}
+
+interface NutritionixResponse {
+  foods?: NutritionixFood[];
+}
+
 // Function to fetch food data provider details from your backend
 const fetchFoodDataProvider = async (providerId: string) => {
   try {
@@ -138,8 +159,7 @@ export const getNutritionixNutrients = async (
   };
 
   try {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const data: any = await apiCall(
+    const data: NutritionixResponse = await apiCall(
       `${NUTRITIONIX_API_BASE_URL}/natural/nutrients`,
       {
         method: 'POST',
@@ -213,13 +233,15 @@ export const getNutritionixBrandedNutrients = async (
   };
 
   try {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const data: any = await apiCall(`${NUTRITIONIX_API_BASE_URL}/search/item`, {
-      method: 'GET',
-      headers,
-      params: { nix_item_id: nixItemId },
-      externalApi: true,
-    });
+    const data: NutritionixResponse = await apiCall(
+      `${NUTRITIONIX_API_BASE_URL}/search/item`,
+      {
+        method: 'GET',
+        headers,
+        params: { nix_item_id: nixItemId },
+        externalApi: true,
+      }
+    );
     if (data && data.foods && data.foods.length > 0) {
       const food = data.foods[0];
       return {