@wger-project/react-components 25.11.17 → 25.11.22

package/src/components/Exercises/models/exercise.ts

@@ -8,42 +8,53 @@ import { ExerciseVideo, ExerciseVideoAdapter } from "components/Exercises/models
 import { Adapter } from "utils/Adapter";
 import { ENGLISH_LANGUAGE_ID } from "utils/consts";
 
+export type ExerciseConstructorParams = {
+    id: number | null;
+    uuid: string | null;
+    category: Category;
+    equipment?: Equipment[];
+    muscles?: Muscle[];
+    musclesSecondary?: Muscle[];
+    images?: ExerciseImage[];
+    variationId?: number | null;
+    lastUpdateGlobal?: Date;
+    translations?: Translation[];
+    videos?: ExerciseVideo[];
+    authors?: string[];
+};
+
 export class Exercise {
-    translations: Translation[] = [];
+    id: number | null;
+    uuid: string | null;
+    variationId: number | null;
+    category: Category;
+    lastUpdateGlobal: Date;
+
+    muscles: Muscle[] = [];
+    musclesSecondary: Muscle[] = [];
+    images: ExerciseImage[] = [];
     videos: ExerciseVideo[] = [];
+    equipment: Equipment[] = [];
     authors: string[] = [];
+    translations: Translation[] = [];
 
-    constructor(
-        public id: number | null,
-        public uuid: string | null,
-        public category: Category,
-        public equipment: Equipment[],
-        public muscles: Muscle[],
-        public musclesSecondary: Muscle[],
-        public images: ExerciseImage[],
-        public variationId: number | null,
-        translations?: Translation[],
-        videos?: ExerciseVideo[],
-        authors?: string[]
-        /*
-            license: number,
-            licenseAuthorS: string[],
-         */
-    ) {
-        if (translations) {
-            this.translations = translations;
-        }
-
-        if (videos) {
-            this.videos = videos;
-        }
-
-        if (authors) {
-            this.authors = authors;
-        }
+    constructor(init: ExerciseConstructorParams) {
+        this.id = init.id;
+        this.uuid = init.uuid;
+        this.category = init.category;
+        this.variationId = init.variationId ?? null;
+        this.lastUpdateGlobal = init.lastUpdateGlobal ?? new Date();
+
+        this.muscles = init.muscles ?? [];
+        this.musclesSecondary = init.musclesSecondary ?? [];
+        this.images = init.images ?? [];
+        this.videos = init.videos ?? [];
+        this.equipment = init.equipment ?? [];
+        this.authors = init.authors ?? [];
+        this.translations = init.translations ?? [];
     }
 
-    // Returns the users translation or english as a fallback
+    // Returns the users' translation or English as a fallback
     //
     // Note that we still check for the case that no english translation can be
     // found. While this can't happen for the "regular" wger server, other local
@@ -97,25 +108,26 @@ export class ExerciseAdapter implements Adapter<Exercise> {
         const translationAdapter = new TranslationAdapter();
         const videoAdapter = new ExerciseVideoAdapter();
 
-        const exercise = new Exercise(
-            item.id,
-            item.uuid,
-            categoryAdapter.fromJson(item.category),
+        const exercise = new Exercise({
+            id: item.id,
+            uuid: item.uuid,
+            category: categoryAdapter.fromJson(item.category),
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            item.equipment.map((e: any) => (equipmentAdapter.fromJson(e))),
+            equipment: item.equipment.map((e: any) => equipmentAdapter.fromJson(e)),
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            item.muscles.map((m: any) => (muscleAdapter.fromJson(m))),
+            muscles: item.muscles.map((m: any) => muscleAdapter.fromJson(m)),
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            item.muscles_secondary.map((m: any) => (muscleAdapter.fromJson(m))),
+            musclesSecondary: item.muscles_secondary.map((m: any) => muscleAdapter.fromJson(m)),
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            item.images.map((i: any) => (imageAdapter.fromJson(i))),
-            item.variations,
+            images: item.images.map((i: any) => imageAdapter.fromJson(i)),
+            variationId: item.variations,
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            item.translations.map((t: any) => translationAdapter.fromJson(t)),
+            translations: item.translations.map((t: any) => translationAdapter.fromJson(t)),
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            item.videos.map((t: any) => videoAdapter.fromJson(t)),
-            item.author_history
-        );
+            videos: item.videos.map((t: any) => videoAdapter.fromJson(t)),
+            authors: item.total_authors_history,
+            lastUpdateGlobal: new Date(item.last_update_global),
+        });
 
         if (!exercise.translations.some(t => t.language === ENGLISH_LANGUAGE_ID)) {
             console.info(`No english translation found for exercise base ${exercise.uuid}!`);

package/src/services/measurements.ts

@@ -2,6 +2,7 @@ import axios from 'axios';
 import { MeasurementCategory, MeasurementCategoryAdapter } from "components/Measurements/models/Category";
 import { MeasurementEntry, MeasurementEntryAdapter } from "components/Measurements/models/Entry";
 import { ApiMeasurementCategoryType } from 'types';
+import { API_MAX_PAGE_SIZE } from "utils/consts";
 import { dateToYYYYMMDD } from "utils/date";
 import { fetchPaginated } from 'utils/requests';
 import { makeHeader, makeUrl } from "utils/url";
@@ -20,8 +21,14 @@ export const getMeasurementCategories = async (options?: MeasurementQueryOptions
     const adapter = new MeasurementCategoryAdapter();
     const entryAdapter = new MeasurementEntryAdapter();
     const categories: MeasurementCategory[] = [];
+    const categoryUrl = makeUrl(API_MEASUREMENTS_CATEGORY_PATH, {
+        query: {
+            limit: API_MAX_PAGE_SIZE,
+            ...filtersetQueryCategories
+        }
+    });
 
-    for await (const page of fetchPaginated(makeUrl(API_MEASUREMENTS_CATEGORY_PATH, { query: { ...filtersetQueryCategories } }), makeHeader())) {
+    for await (const page of fetchPaginated(categoryUrl, makeHeader())) {
         for (const catData of page) {
             categories.push(adapter.fromJson(catData));
         }
@@ -30,7 +37,13 @@ export const getMeasurementCategories = async (options?: MeasurementQueryOptions
     // Load entries for each category
     const entryResponses = categories.map(async (category) => {
         const out: MeasurementEntry[] = [];
-        const url = makeUrl(API_MEASUREMENTS_ENTRY_PATH, { query: { category: category.id, ...filtersetQueryEntries } });
+        const url = makeUrl(API_MEASUREMENTS_ENTRY_PATH, {
+            query: {
+                category: category.id,
+                limit: API_MAX_PAGE_SIZE,
+                ...filtersetQueryEntries,
+            }
+        });
 
         // Collect all pages of entries
         for await (const page of fetchPaginated(url, makeHeader())) {

package/src/tests/exerciseTestdata.ts

@@ -46,16 +46,16 @@ export const testEquipment = [
     testEquipmentRocks,
 ];
 
-export const testExerciseSquats = new Exercise(
-    345,
-    "c788d643-150a-4ac7-97ef-84643c6419bf",
-    testCategoryLegs,
-    [testEquipmentBarbell, testEquipmentRocks],
-    [testMuscleBiggus, testMuscleRectusAbdominis],
-    [],
-    [],
-    null,
-    [
+export const testExerciseSquats = new Exercise({
+    id: 345,
+    uuid: "c788d643-150a-4ac7-97ef-84643c6419bf",
+    category: testCategoryLegs,
+    equipment: [testEquipmentBarbell, testEquipmentRocks],
+    muscles: [testMuscleBiggus, testMuscleRectusAbdominis],
+    musclesSecondary: [],
+    images: [],
+    variationId: null,
+    translations: [
         new Translation(111,
             '583281c7-2362-48e7-95d5-8fd6c455e0fb',
             'Squats',
@@ -74,18 +74,18 @@ export const testExerciseSquats = new Exercise(
             ]
         )
     ]
-);
+});
 
-export const testExerciseBenchPress = new Exercise(
-    2,
-    "abcdef-150a-4ac7-97ef-84643c6419bf",
-    testCategoryLegs,
-    [testEquipmentBarbell, testEquipmentRocks],
-    [testMuscleDacttilaris, testMuscleDeltoid],
-    [],
-    [],
-    1,
-    [
+export const testExerciseBenchPress = new Exercise({
+    id: 2,
+    uuid: "abcdef-150a-4ac7-97ef-84643c6419bf",
+    category: testCategoryLegs,
+    equipment: [testEquipmentBarbell, testEquipmentRocks],
+    muscles: [testMuscleDacttilaris, testMuscleDeltoid],
+    musclesSecondary: [],
+    images: [],
+    variationId: 1,
+    translations: [
         new Translation(111,
             '583281c7-2362-48e7-95d5-8fd6c455e0fb',
             'Benchpress',
@@ -93,17 +93,19 @@ export const testExerciseBenchPress = new Exercise(
             2
         ),
     ]
-);
-export const testExerciseCurls = new Exercise(
-    3,
-    "abcdef-150a-4ac7-97ef-84643c6419bf",
-    testCategoryArms,
-    [testEquipmentDumbbell],
-    [testMuscleBiggus, testMuscleDacttilaris],
-    [],
-    [],
-    1,
-    [
+});
+
+export const testExerciseCurls = new Exercise({
+    id: 3,
+    uuid: "abcdef-150a-4ac7-97ef-84643c6419bf",
+    lastUpdateGlobal: new Date(),
+    category: testCategoryArms,
+    equipment: [testEquipmentDumbbell],
+    muscles: [testMuscleBiggus, testMuscleDacttilaris],
+    musclesSecondary: [],
+    images: [],
+    variationId: 1,
+    translations: [
         new Translation(111,
             '583281c7-2362-48e7-95d5-8fd6c455e0fb',
             'Curls',
@@ -111,17 +113,19 @@ export const testExerciseCurls = new Exercise(
             2
         ),
     ]
-);
-export const testExerciseCrunches = new Exercise(
-    4,
-    "abcdef-150a-4ac7-97ef-84643c6419bf",
-    testCategoryChest,
-    [testEquipmentRocks],
-    [testMuscleDeltoid],
-    [],
-    [],
-    null,
-    [
+});
+
+export const testExerciseCrunches = new Exercise({
+    id: 4,
+    uuid: "abcdef-150a-4ac7-97ef-84643c6419bf",
+    lastUpdateGlobal: new Date(),
+    category: testCategoryChest,
+    equipment: [testEquipmentRocks],
+    muscles: [testMuscleDeltoid],
+    musclesSecondary: [],
+    images: [],
+    variationId: null,
+    translations: [
         new Translation(111,
             '583281c7-2362-48e7-95d5-8fd6c455e0fb',
             'Crunches',
@@ -129,17 +133,19 @@ export const testExerciseCrunches = new Exercise(
             2
         ),
     ]
-);
-export const testExerciseSkullCrusher = new Exercise(
-    5,
-    "abcdef-150a-4ac7-97ef-84643c6419bf",
-    testCategoryArms,
-    [testEquipmentBarbell],
-    [testMuscleRectusAbdominis],
-    [],
-    [],
-    2,
-    [
+});
+
+export const testExerciseSkullCrusher = new Exercise({
+    id: 5,
+    uuid: "abcdef-150a-4ac7-97ef-84643c6419bf",
+    lastUpdateGlobal: new Date(),
+    category: testCategoryArms,
+    equipment: [testEquipmentBarbell],
+    muscles: [testMuscleRectusAbdominis],
+    musclesSecondary: [],
+    images: [],
+    variationId: 2,
+    translations: [
         new Translation(111,
             '583281c7-2362-48e7-95d5-8fd6c455e0fb',
             'Skull crusher',
@@ -147,7 +153,7 @@ export const testExerciseSkullCrusher = new Exercise(
             2
         ),
     ]
-);
+});
 
 export const testExercises = [
     testExerciseSquats,

package/src/tests/exercises/searchResponse.ts

@@ -1,18 +1,19 @@
-import { Exercise } from "components/Exercises/models/exercise";
 import { Category } from "components/Exercises/models/category";
+import { Exercise } from "components/Exercises/models/exercise";
 import { Translation } from "components/Exercises/models/translation";
 
 export const searchResponse: Exercise[] = [
-    new Exercise(
-        998, // id
-        "uuid-998", // uuid
-        new Category(8, "Bauch"), // category
-        [], // equipment
-        [], // muscles
-        [], // musclesSecondary
-        [], // images
-        null, // variationId
-        [
+    new Exercise({
+        id: 998,
+        uuid: "uuid-998",
+        lastUpdateGlobal: new Date(),
+        category: new Category(8, "Bauch"),
+        equipment: [],
+        muscles: [],
+        musclesSecondary: [],
+        images: [],
+        variationId: null,
+        translations: [
             new Translation(
                 1149, // id
                 "uuid-1149", // uuid
@@ -20,20 +21,21 @@ export const searchResponse: Exercise[] = [
                 "", // description
                 1 // language (German)
             )
-        ], // translations
-        [], // videos
-        [] // authors
-    ),
-    new Exercise(
-        979, // id
-        "uuid-979", // uuid
-        new Category(11, "Brust"), // category
-        [], // equipment
-        [], // muscles
-        [], // musclesSecondary
-        [], // images
-        null, // variationId
-        [
+        ],
+        videos: [],
+        authors: []
+    }),
+    new Exercise({
+        id: 979,
+        uuid: "uuid-979",
+        lastUpdateGlobal: new Date(),
+        category: new Category(11, "Brust"),
+        equipment: [],
+        muscles: [],
+        musclesSecondary: [],
+        images: [],
+        variationId: null,
+        translations: [
             new Translation(
                 1213, // id
                 "uuid-1213", // uuid
@@ -41,8 +43,8 @@ export const searchResponse: Exercise[] = [
                 "", // description
                 1 // language (German)
             )
-        ], // translations
-        [], // videos
-        [] // authors
-    )
+        ],
+        videos: [],
+        authors: []
+    })
 ];

package/src/tests/responseApi.ts

@@ -41,20 +41,21 @@ const image = new ExerciseImage(
     true
 );
 
-export const testApiExercise1 = new Exercise(
-    345,
-    "c788d643-150a-4ac7-97ef-84643c6419bf",
-    category,
-    [equipment1, equipment2],
-    [muscle1],
-    [muscle2],
-    [image],
-    228,
-    [
+export const testApiExercise1 = new Exercise({
+    id: 345,
+    uuid: "c788d643-150a-4ac7-97ef-84643c6419bf",
+    lastUpdateGlobal: new Date("2025-11-22T19:32:02.590941+01:00"),
+    category: category,
+    equipment: [equipment1, equipment2],
+    muscles: [muscle1],
+    musclesSecondary: [muscle2],
+    images: [image],
+    variationId: 228,
+    translations: [
         testExerciseTranslation1,
         testExerciseTranslation2
     ],
-    [
+    videos: [
         new ExerciseVideo(
             1,
             "b1c934fa-c4f8-4d84-8cb4-7802be0d284c",
@@ -62,12 +63,13 @@ export const testApiExercise1 = new Exercise(
             false
         )
     ],
-    [
+    authors: [
         "wger.de",
         "author 1",
-        "somebody else"
+        "somebody else",
+        "Mr. T"
     ]
-);
+});
 
 
 export const responseApiExerciseInfo = {
@@ -77,6 +79,9 @@ export const responseApiExerciseInfo = {
     "results": [{
         "id": 345,
         "uuid": "c788d643-150a-4ac7-97ef-84643c6419bf",
+        "created": "2023-08-06T10:17:17.422900+02:00",
+        "last_update": "2025-11-22T14:17:20.119332+01:00",
+        "last_update_global": "2025-11-22T19:32:02.590941+01:00",
         "category": {
             "id": 10,
             "name": "Abs"
@@ -192,6 +197,12 @@ export const responseApiExerciseInfo = {
             "wger.de",
             "author 1",
             "somebody else"
+        ],
+        "total_authors_history": [
+            "wger.de",
+            "author 1",
+            "somebody else",
+            "Mr. T"
         ]
     }]
 };