Replace raw SQL in StartPlan with query builder code

Running this code results in the following error: TypeError: subQueryBuilder.getParameters is not a function (it is undefined) at createFromAlias (http://localhost:8081/index.bundle//&platform=android&dev=t y=false&app=com.massive&modulesOnly=false&runModule=true:205802:59) at from (http://localhost:8081/index.bundle//&platform=android&dev=true&minify= =com.massive&modulesOnly=false&runModule=true:201576:45) at ?anon_0_ (http://localhost:8081/index.bundle//&platform=android&dev=true&min &app=com.massive&modulesOnly=false&runModule=true:316375:209) at next (native) at asyncGeneratorStep (http://localhost:8081/index.bundle//&platform=android&de nify=false&app=com.massive&modulesOnly=false&runModule=true:28380:26) at _next (http://localhost:8081/index.bundle//&platform=android&dev=true&minify p=com.massive&modulesOnly=false&runModule=true:28399:29) at anonymous (http://localhost:8081/index.bundle//&platform=android&dev=true&mi e&app=com.massive&modulesOnly=false&runModule=true:28404:14) at tryCallTwo (/root/react-native/packages/react-native/ReactAndroid/hermes-eng Release/4i495j47/arm64-v8a/lib/InternalBytecode/InternalBytecode.js:61:9) at doResolve (/root/react-native/packages/react-native/ReactAndroid/hermes-engi elease/4i495j47/arm64-v8a/lib/InternalBytecode/InternalBytecode.js:216:25) at Promise (/root/react-native/packages/react-native/ReactAndroid/hermes-engine ease/4i495j47/arm64-v8a/lib/InternalBytecode/InternalBytecode.js:82:14) at anonymous (http://localhost:8081/index.bundle//&platform=android&dev=true&mi e&app=com.massive&modulesOnly=false&runModule=true:28396:25) at anonymous (http://localhost:8081/index.bundle//&platform=android&dev=true&mi e&app=com.massive&modulesOnly=false&runModule=true:316420:14) at callback (http://localhost:8081/index.bundle//&platform=android&dev=true&min &app=com.massive&modulesOnly=false&runModule=true:145400:29) at anonymous (http://localhost:8081/index.bundle//&platform=android&dev=true&mi e&app=com.massive&modulesOnly=false&runModule=true:145419:27) at commitHookEffectListMount (http://localhost:8081/index.bundle//&platform=and true&minify=false&app=com.massive&modulesOnly=false&runModule=true:94929:38) at commitPassiveMountOnFiber (http://localhost:8081/index.bundle//&platform=and true&minify=false&app=com.massive&modulesOnly=false&runModule=true:96130:44) at commitPassiveMountEffects_complete (http://localhost:8081/index.bundle//&pla roid&dev=true&minify=false&app=com.massive&modulesOnly=false&runModule=true:96102:4 at commitPassiveMountEffects_begin (http://localhost:8081/index.bundle//&platfo d&dev=true&minify=false&app=com.massive&modulesOnly=false&runModule=true:96092:47) at commitPassiveMountEffects (http://localhost:8081/index.bundle//&platform=and true&minify=false&app=com.massive&modulesOnly=false&runModule=true:96082:40) at flushPassiveEffectsImpl (http://localhost:8081/index.bundle//&platform=andro ue&minify=false&app=com.massive&modulesOnly=false&runModule=true:97758:34) at flushPassiveEffects (http://localhost:8081/index.bundle//&platform=android&d inify=false&app=com.massive&modulesOnly=false&runModule=true:97713:43) at performSyncWorkOnRoot (http://localhost:8081/index.bundle//&platform=android &minify=false&app=com.massive&modulesOnly=false&runModule=true:97003:28) at flushSyncCallbacks (http://localhost:8081/index.bundle//&platform=android&de nify=false&app=com.massive&modulesOnly=false&runModule=true:86202:36) at flushSyncCallbacksOnlyInLegacyMode (http://localhost:8081/index.bundle//&pla
2023-08-13 20:59:59 +12:00
17 changed files with 162 additions and 312 deletions
--- a/EditPlan.tsx
+++ b/EditPlan.tsx
@ -14,12 +14,10 @@ import { PlanPageParams } from "./plan-page-params";
 import StackHeader from "./StackHeader";
 import Switch from "./Switch";
 import { DAYS } from "./time";
-import AppInput from "./AppInput";

 export default function EditPlan() {
  const { params } = useRoute<RouteProp<PlanPageParams, "EditPlan">>();
  const { plan } = params;
-  const [title, setTitle] = useState<string>(plan?.title);
  const [days, setDays] = useState<string[]>(
    plan.days ? plan.days.split(",") : []
  );
@ -47,13 +45,8 @@ export default function EditPlan() {
    if (!days || !workouts) return;
    const newWorkouts = workouts.filter((workout) => workout).join(",");
    const newDays = days.filter((day) => day).join(",");
-    await planRepo.save({
-      title: title,
-      days: newDays,
-      workouts: newWorkouts,
-      id: plan.id,
-    });
-  }, [title, days, workouts, plan]);
+    await planRepo.save({ days: newDays, workouts: newWorkouts, id: plan.id });
+  }, [days, workouts, plan]);

  const toggleWorkout = useCallback(
    (on: boolean, name: string) => {
@ -103,11 +96,6 @@ export default function EditPlan() {
      </StackHeader>
      <View style={{ padding: PADDING, flex: 1 }}>
        <ScrollView style={{ flex: 1 }}>
-          <AppInput
-            label="Title"
-            value={title}
-            onChangeText={(value) => setTitle(value)}
-          />
          <Text style={styles.title}>Days</Text>
          {DAYS.map((day) => (
            <Switch
--- a/EditSet.tsx
+++ b/EditSet.tsx
@ -9,7 +9,7 @@ import { format } from "date-fns";
 import { useCallback, useRef, useState } from "react";
 import { NativeModules, TextInput, View } from "react-native";
 import DocumentPicker from "react-native-document-picker";
-import { Button, Card, IconButton, TouchableRipple } from "react-native-paper";
+import { Button, Card, TouchableRipple } from "react-native-paper";
 import AppInput from "./AppInput";
 import ConfirmDialog from "./ConfirmDialog";
 import { MARGIN, PADDING } from "./constants";
@ -155,65 +155,34 @@ export default function EditSet() {
          onSubmitEditing={() => repsRef.current?.focus()}
        />

-        <View style={{ flexDirection: "row" }}>
-          <AppInput
-            style={{
-              flex: 1,
-              marginBottom: MARGIN,
-            }}
-            label="Reps"
-            keyboardType="numeric"
-            value={reps}
-            onChangeText={(newReps) => {
-              const fixed = fixNumeric(newReps);
-              setReps(fixed);
-              if (fixed.length !== newReps.length)
-                toast("Reps must be a number");
-            }}
-            onSubmitEditing={() => weightRef.current?.focus()}
-            selection={selection}
-            onSelectionChange={(e) => setSelection(e.nativeEvent.selection)}
-            innerRef={repsRef}
-          />
-          <IconButton
-            icon="add"
-            onPress={() => setReps((Number(reps) + 1).toString())}
-          />
-          <IconButton
-            icon="remove"
-            onPress={() => setReps((Number(reps) - 1).toString())}
-          />
-        </View>
-
-        <View
-          style={{
-            flexDirection: "row",
-            marginBottom: MARGIN,
+        <AppInput
+          label="Reps"
+          keyboardType="numeric"
+          value={reps}
+          onChangeText={(newReps) => {
+            const fixed = fixNumeric(newReps);
+            setReps(fixed);
+            if (fixed.length !== newReps.length) toast("Reps must be a number");
          }}
-        >
-          <AppInput
-            style={{ flex: 1 }}
-            label="Weight"
-            keyboardType="numeric"
-            value={weight}
-            onChangeText={(newWeight) => {
-              const fixed = fixNumeric(newWeight);
-              setWeight(fixed);
-              if (fixed.length !== newWeight.length)
-                toast("Weight must be a number");
-            }}
-            onSubmitEditing={handleSubmit}
-            innerRef={weightRef}
-          />
-          <IconButton
-            icon="add"
-            onPress={() => setWeight((Number(weight) + 2.5).toString())}
-          />
-          <IconButton
-            icon="remove"
-            onPress={() => setWeight((Number(weight) - 2.5).toString())}
-          />
-        </View>
+          onSubmitEditing={() => weightRef.current?.focus()}
+          selection={selection}
+          onSelectionChange={(e) => setSelection(e.nativeEvent.selection)}
+          innerRef={repsRef}
+        />
+
+        <AppInput
+          label="Weight"
+          keyboardType="numeric"
+          value={weight}
+          onChangeText={(newWeight) => {
+            const fixed = fixNumeric(newWeight);
+            setWeight(fixed);
+            if (fixed.length !== newWeight.length)
+              toast("Weight must be a number");
+          }}
+          onSubmitEditing={handleSubmit}
+          innerRef={weightRef}
+        />

        {settings.showUnit && (
          <AppInput
--- a/EditSets.tsx
+++ b/EditSets.tsx
@ -7,7 +7,7 @@ import {
 import { useCallback, useState } from "react";
 import { View } from "react-native";
 import DocumentPicker from "react-native-document-picker";
-import { Button, Card, IconButton, TouchableRipple } from "react-native-paper";
+import { Button, Card, TouchableRipple } from "react-native-paper";
 import { In } from "typeorm";
 import AppInput from "./AppInput";
 import ConfirmDialog from "./ConfirmDialog";
@ -89,57 +89,23 @@ export default function EditSets() {
          autoFocus={!name}
        />

-        <View
-          style={{
-            flexDirection: "row",
-            marginBottom: MARGIN,
-          }}
-        >
-          <AppInput
-            style={{
-              flex: 1,
-            }}
-            label={`Reps: ${oldReps}`}
-            keyboardType="numeric"
-            value={reps}
-            onChangeText={setReps}
-            selection={selection}
-            onSelectionChange={(e) => setSelection(e.nativeEvent.selection)}
-            autoFocus={!!name}
-          />
-          <IconButton
-            icon="add"
-            onPress={() => setReps((Number(reps) + 1).toString())}
-          />
-          <IconButton
-            icon="remove"
-            onPress={() => setReps((Number(reps) - 1).toString())}
-          />
-        </View>
+        <AppInput
+          label={`Reps: ${oldReps}`}
+          keyboardType="numeric"
+          value={reps}
+          onChangeText={setReps}
+          selection={selection}
+          onSelectionChange={(e) => setSelection(e.nativeEvent.selection)}
+          autoFocus={!!name}
+        />

-        <View
-          style={{
-            flexDirection: "row",
-            marginBottom: MARGIN,
-          }}
-        >
-          <AppInput
-            style={{ flex: 1 }}
-            label={`Weights: ${weights}`}
-            keyboardType="numeric"
-            value={weight}
-            onChangeText={setWeight}
-            onSubmitEditing={handleSubmit}
-          />
-          <IconButton
-            icon="add"
-            onPress={() => setWeight((Number(weight) + 2.5).toString())}
-          />
-          <IconButton
-            icon="remove"
-            onPress={() => setWeight((Number(weight) - 2.5).toString())}
-          />
-        </View>
+        <AppInput
+          label={`Weights: ${weights}`}
+          keyboardType="numeric"
+          value={weight}
+          onChangeText={setWeight}
+          onSubmitEditing={handleSubmit}
+        />

        {settings.showUnit && (
          <AppInput
--- a/GraphsList.tsx
+++ b/GraphsList.tsx
@ -6,19 +6,15 @@ import {
 import { useCallback, useState } from "react";
 import { FlatList, Image } from "react-native";
 import { List } from "react-native-paper";
-import { getBestSets } from "./best.service";
-import { LIMIT } from "./constants";
-import { settingsRepo } from "./db";
-import DrawerHeader from "./DrawerHeader";
 import { GraphsPageParams } from "./GraphsPage";
+import { setRepo, settingsRepo } from "./db";
+import DrawerHeader from "./DrawerHeader";
 import GymSet from "./gym-set";
 import Page from "./Page";
 import Settings from "./settings";

 export default function GraphsList() {
-  const [bests, setBests] = useState<GymSet[]>([]);
-  const [offset, setOffset] = useState(0);
-  const [end, setEnd] = useState(false);
+  const [bests, setBests] = useState<GymSet[]>();
  const [term, setTerm] = useState("");
  const navigation = useNavigation<NavigationProp<GraphsPageParams>>();
  const [settings, setSettings] = useState<Settings>();
@ -30,9 +26,22 @@ export default function GraphsList() {
  );

  const refresh = useCallback(async (value: string) => {
-    const result = await getBestSets({ term: value, offset: 0 });
+    const result = await setRepo
+      .createQueryBuilder("gym_set")
+      .select(["gym_set.name", "gym_set.reps", "gym_set.weight"])
+      .groupBy("gym_set.name")
+      .innerJoin(
+        (qb) =>
+          qb
+            .select(["gym_set2.name", "MAX(gym_set2.weight) AS max_weight"])
+            .from(GymSet, "gym_set2")
+            .where("gym_set2.name LIKE (:name)", { name: `%${value.trim()}%` })
+            .groupBy("gym_set2.name"),
+        "subquery",
+        "gym_set.name = subquery.gym_set2_name AND gym_set.weight = subquery.max_weight"
+      )
+      .getMany();
    setBests(result);
-    setOffset(0);
  }, []);

  useFocusEffect(
@ -41,18 +50,6 @@ export default function GraphsList() {
    }, [refresh, term])
  );

-  const next = useCallback(async () => {
-    if (end) return;
-    const newOffset = offset + LIMIT;
-    console.log(`${GraphsList.name}.next:`, { offset, newOffset, term });
-    const newBests = await getBestSets({ term, offset });
-    if (newBests.length === 0) return setEnd(true);
-    if (!bests) return;
-    setBests([...bests, ...newBests]);
-    if (newBests.length < LIMIT) return setEnd(true);
-    setOffset(newOffset);
-  }, [term, end, offset, bests]);
-
  const search = useCallback(
    (value: string) => {
      setTerm(value);
@ -89,12 +86,7 @@ export default function GraphsList() {
            description="Once sets have been added, this will highlight your personal bests."
          />
        ) : (
-          <FlatList
-            style={{ flex: 1 }}
-            renderItem={renderItem}
-            data={bests}
-            onEndReached={next}
-          />
+          <FlatList style={{ flex: 1 }} renderItem={renderItem} data={bests} />
        )}
      </Page>
    </>
--- a/PlanItem.tsx
+++ b/PlanItem.tsx
@ -56,37 +56,28 @@ export default function PlanItem({
    setIds([item.id]);
  }, [ids.length, item.id, setIds]);

-  const currentDays = days.map((day, index) => (
-    <Text key={day}>
-      {day === today ? (
-        <Text
-          style={{
-            fontWeight: "bold",
-            textDecorationLine: "underline",
-          }}
-        >
-          {day}
-        </Text>
-      ) : (
-        day
-      )}
-      {index === days.length - 1 ? "" : ", "}
-    </Text>
-  ));
-
  const title = useMemo(
    () =>
-      item.title ? (
-        <Text style={{ fontWeight: "bold" }}>{item.title}</Text>
-      ) : (
-        currentDays
-      ),
-    [item.title, currentDays]
+      days.map((day, index) => (
+        <Text key={day}>
+          {day === today ? (
+            <Text
+              style={{ fontWeight: "bold", textDecorationLine: "underline" }}
+            >
+              {day}
+            </Text>
+          ) : (
+            day
+          )}
+          {index === days.length - 1 ? "" : ", "}
+        </Text>
+      )),
+    [days, today]
  );

  const description = useMemo(
-    () => (item.title ? currentDays : item.workouts.replace(/,/g, ", ")),
-    [item.title, currentDays, item.workouts]
+    () => item.workouts.replace(/,/g, ", "),
+    [item.workouts]
  );

  const backgroundColor = useMemo(() => {
--- a/PlanList.tsx
+++ b/PlanList.tsx
@ -25,7 +25,6 @@ export default function PlanList() {
    planRepo
      .find({
        where: [
-          { title: Like(`%${value.trim()}%`) },
          { days: Like(`%${value.trim()}%`) },
          { workouts: Like(`%${value.trim()}%`) },
        ],
@ -55,9 +54,7 @@ export default function PlanList() {
  );

  const onAdd = () =>
-    navigation.navigate("EditPlan", {
-      plan: { title: "", days: "", workouts: "" },
-    });
+    navigation.navigate("EditPlan", { plan: { days: "", workouts: "" } });

  const edit = useCallback(async () => {
    const plan = await planRepo.findOne({ where: { id: ids.pop() } });
--- a/Select.tsx
+++ b/Select.tsx
@ -1,6 +1,6 @@
 import React, { useCallback, useMemo, useState } from "react";
 import { View } from "react-native";
-import { Button, Menu, Subheading, useTheme } from "react-native-paper";
+import { Button, Menu, Subheading } from "react-native-paper";
 import { ITEM_PADDING } from "./constants";

 export interface Item {
@ -21,7 +21,6 @@ function Select({
  label?: string;
 }) {
  const [show, setShow] = useState(false);
-  const { colors } = useTheme();

  const selected = useMemo(
    () => items.find((item) => item.value === value) || items[0],
@ -61,7 +60,7 @@ function Select({
      >
        {items.map((item) => (
          <Menu.Item
-            titleStyle={{ color: item.color || colors.onSurface }}
+            titleStyle={{ color: item.color }}
            key={item.value}
            title={item.label}
            onPress={() => handlePress(item.value)}
--- a/SetList.tsx
+++ b/SetList.tsx
@ -7,7 +7,6 @@ import { useCallback, useState } from "react";
 import { FlatList } from "react-native";
 import { List } from "react-native-paper";
 import { Like } from "typeorm";
-import { LIMIT } from "./constants";
 import { getNow, setRepo, settingsRepo } from "./db";
 import DrawerHeader from "./DrawerHeader";
 import GymSet, { defaultSet } from "./gym-set";
@ -17,6 +16,8 @@ import Page from "./Page";
 import SetItem from "./SetItem";
 import Settings from "./settings";

+const limit = 15;
+
 export default function SetList() {
  const [sets, setSets] = useState<GymSet[]>([]);
  const [offset, setOffset] = useState(0);
@ -29,11 +30,11 @@ export default function SetList() {
  const refresh = useCallback(async (value: string) => {
    const newSets = await setRepo.find({
      where: { name: Like(`%${value.trim()}%`), hidden: 0 as any },
-      take: LIMIT,
+      take: limit,
      skip: 0,
      order: { created: "DESC" },
    });
-    console.log(`${SetList.name}.refresh:`, { value });
+    console.log(`${SetList.name}.refresh:`, { value, limit });
    setSets(newSets);
    setOffset(0);
    setEnd(false);
@ -62,18 +63,18 @@ export default function SetList() {

  const next = useCallback(async () => {
    if (end) return;
-    const newOffset = offset + LIMIT;
+    const newOffset = offset + limit;
    console.log(`${SetList.name}.next:`, { offset, newOffset, term });
    const newSets = await setRepo.find({
      where: { name: Like(`%${term}%`), hidden: 0 as any },
-      take: LIMIT,
+      take: limit,
      skip: newOffset,
      order: { created: "DESC" },
    });
    if (newSets.length === 0) return setEnd(true);
    if (!sets) return;
    setSets([...sets, ...newSets]);
-    if (newSets.length < LIMIT) return setEnd(true);
+    if (newSets.length < limit) return setEnd(true);
    setOffset(newOffset);
  }, [term, end, offset, sets]);

--- a/SettingsPage.tsx
+++ b/SettingsPage.tsx
@ -244,13 +244,13 @@ export default function SettingsPage() {
  }, [settings, darkColor, formatOptions, theme, lightColor]);

  const renderSelect = useCallback(
-    (input: Input<string>) => (
+    (item: Input<string>) => (
      <Select
-        key={input.name}
-        value={input.value}
-        onChange={(value) => changeString(input.key, value)}
-        label={input.name}
-        items={input.items}
+        key={item.name}
+        value={item.value}
+        onChange={(value) => changeString(item.key, value)}
+        label={item.name}
+        items={item.items}
      />
    ),
    [changeString]
--- a/StartPlan.tsx
+++ b/StartPlan.tsx
@ -10,7 +10,7 @@ import { FlatList, NativeModules, TextInput, View } from "react-native";
 import { Button, IconButton, ProgressBar } from "react-native-paper";
 import AppInput from "./AppInput";
 import { getBestSet } from "./best.service";
-import { MARGIN, PADDING } from "./constants";
+import { PADDING } from "./constants";
 import CountMany from "./count-many";
 import { AppDataSource } from "./data-source";
 import { getNow, setRepo, settingsRepo } from "./db";
@ -45,18 +45,30 @@ export default function StartPlan() {
    const questions = workouts
      .map((workout, index) => `('${workout}',${index})`)
      .join(",");
-    const select = `
-      SELECT workouts.name, COUNT(sets.id) as total, sets.sets
-      FROM (select 0 as name, 0 as sequence union values ${questions}) as workouts 
-      LEFT JOIN sets ON sets.name = workouts.name 
-        AND sets.created LIKE STRFTIME('%Y-%m-%d%%', 'now', 'localtime')
-        AND NOT sets.hidden
-      GROUP BY workouts.name
-      ORDER BY workouts.sequence
-      LIMIT -1
-      OFFSET 1
-    `;
-    const newCounts = await AppDataSource.manager.query(select);
+    const newCounts = await AppDataSource.manager
+      .createQueryBuilder()
+      .select("workouts.name")
+      .addSelect("COUNT(sets.id)", "total")
+      .addSelect("sets.sets")
+      .from((qb) => {
+        const subQuery = qb
+          .subQuery()
+          .select("0", "name")
+          .addSelect("0", "sequence")
+          .from("workouts", "workouts")
+          .getQuery();
+        return `(${subQuery} UNION ALL values ${questions})`;
+      }, "workouts")
+      .leftJoin(
+        "sets",
+        "sets",
+        "sets.name = workouts.name AND sets.created LIKE STRFTIME('%Y-%m-%d%%', 'now', 'localtime') AND NOT sets.hidden"
+      )
+      .groupBy("workouts.name")
+      .orderBy("workouts.sequence")
+      .limit(-1)
+      .offset(1)
+      .getRawMany();
    console.log(`${StartPlan.name}.focus:`, { newCounts });
    setCounts(newCounts);
  }, [workouts]);
@ -126,69 +138,35 @@ export default function StartPlan() {
      </StackHeader>
      <View style={{ padding: PADDING, flex: 1, flexDirection: "column" }}>
        <View style={{ flex: 1 }}>
-          <View
-            style={{
-              flexDirection: "row",
-              marginBottom: MARGIN,
+          <AppInput
+            label="Reps"
+            keyboardType="numeric"
+            value={reps}
+            onChangeText={(newReps) => {
+              const fixed = fixNumeric(newReps);
+              setReps(fixed);
+              if (fixed.length !== newReps.length)
+                toast("Reps must be a number");
            }}
-          >
-            <AppInput
-              label="Reps"
-              style={{ flex: 1 }}
-              keyboardType="numeric"
-              value={reps}
-              onChangeText={(newReps) => {
-                const fixed = fixNumeric(newReps);
-                setReps(fixed);
-                if (fixed.length !== newReps.length)
-                  toast("Reps must be a number");
-              }}
-              onSubmitEditing={() => weightRef.current?.focus()}
-              selection={selection}
-              onSelectionChange={(e) => setSelection(e.nativeEvent.selection)}
-              innerRef={repsRef}
-            />
-            <IconButton
-              icon="add"
-              onPress={() => setReps((Number(reps) + 1).toString())}
-            />
-            <IconButton
-              icon="remove"
-              onPress={() => setReps((Number(reps) - 1).toString())}
-            />
-          </View>
-
-          <View
-            style={{
-              flexDirection: "row",
-              marginBottom: MARGIN,
+            onSubmitEditing={() => weightRef.current?.focus()}
+            selection={selection}
+            onSelectionChange={(e) => setSelection(e.nativeEvent.selection)}
+            innerRef={repsRef}
+          />
+          <AppInput
+            label="Weight"
+            keyboardType="numeric"
+            value={weight}
+            onChangeText={(newWeight) => {
+              const fixed = fixNumeric(newWeight);
+              setWeight(fixed);
+              if (fixed.length !== newWeight.length)
+                toast("Weight must be a number");
            }}
-          >
-            <AppInput
-              label="Weight"
-              style={{ flex: 1 }}
-              keyboardType="numeric"
-              value={weight}
-              onChangeText={(newWeight) => {
-                const fixed = fixNumeric(newWeight);
-                setWeight(fixed);
-                if (fixed.length !== newWeight.length)
-                  toast("Weight must be a number");
-              }}
-              onSubmitEditing={handleSubmit}
-              innerRef={weightRef}
-              blurOnSubmit
-            />
-            <IconButton
-              icon="add"
-              onPress={() => setWeight((Number(weight) + 2.5).toString())}
-            />
-            <IconButton
-              icon="remove"
-              onPress={() => setWeight((Number(weight) - 2.5).toString())}
-            />
-          </View>
-
+            onSubmitEditing={handleSubmit}
+            innerRef={weightRef}
+            blurOnSubmit
+          />
          {settings?.showUnit && (
            <AppInput
              autoCapitalize="none"
--- a/WorkoutList.tsx
+++ b/WorkoutList.tsx
@ -6,7 +6,6 @@ import {
 import { useCallback, useState } from "react";
 import { FlatList } from "react-native";
 import { List } from "react-native-paper";
-import { LIMIT } from "./constants";
 import { setRepo, settingsRepo } from "./db";
 import DrawerHeader from "./DrawerHeader";
 import GymSet from "./gym-set";
@ -16,6 +15,8 @@ import Settings from "./settings";
 import WorkoutItem from "./WorkoutItem";
 import { WorkoutsPageParams } from "./WorkoutsPage";

+const limit = 15;
+
 export default function WorkoutList() {
  const [workouts, setWorkouts] = useState<GymSet[]>();
  const [offset, setOffset] = useState(0);
@ -31,7 +32,7 @@ export default function WorkoutList() {
      .where("name LIKE :name", { name: `%${value.trim()}%` })
      .groupBy("name")
      .orderBy("name")
-      .limit(LIMIT)
+      .limit(limit)
      .getMany();
    console.log(`${WorkoutList.name}`, { newWorkout: newWorkouts[0] });
    setWorkouts(newWorkouts);
@ -60,10 +61,10 @@ export default function WorkoutList() {

  const next = useCallback(async () => {
    if (end) return;
-    const newOffset = offset + LIMIT;
+    const newOffset = offset + limit;
    console.log(`${SetList.name}.next:`, {
      offset,
-      limit: LIMIT,
+      limit,
      newOffset,
      term,
    });
@ -73,13 +74,13 @@ export default function WorkoutList() {
      .where("name LIKE :name", { name: `%${term.trim()}%` })
      .groupBy("name")
      .orderBy("name")
-      .limit(LIMIT)
+      .limit(limit)
      .offset(newOffset)
      .getMany();
    if (newWorkouts.length === 0) return setEnd(true);
    if (!workouts) return;
    setWorkouts([...workouts, ...newWorkouts]);
-    if (newWorkouts.length < LIMIT) return setEnd(true);
+    if (newWorkouts.length < limit) return setEnd(true);
    setOffset(newOffset);
  }, [term, end, offset, workouts]);

--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -85,8 +85,8 @@ android {
        applicationId "com.massive"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 36174
-        versionName "1.148"
+        versionCode 36173
+        versionName "1.147"
    }
    signingConfigs {
        release {
--- a/best.service.ts
+++ b/best.service.ts
@ -1,4 +1,3 @@
-import { LIMIT } from "./constants";
 import { setRepo } from "./db";
 import GymSet from "./gym-set";

@ -14,29 +13,3 @@ export const getBestSet = async (name: string): Promise<GymSet> => {
    .addOrderBy("reps", "DESC")
    .getOne();
 };
-
-export const getBestSets = ({
-  term: term,
-  offset,
-}: {
-  term: string;
-  offset?: number;
-}) => {
-  return setRepo
-    .createQueryBuilder("gym_set")
-    .select(["gym_set.name", "gym_set.reps", "gym_set.weight"])
-    .groupBy("gym_set.name")
-    .innerJoin(
-      (qb) =>
-        qb
-          .select(["gym_set2.name", "MAX(gym_set2.weight) AS max_weight"])
-          .from(GymSet, "gym_set2")
-          .where("gym_set2.name LIKE (:name)", { name: `%${term.trim()}%` })
-          .groupBy("gym_set2.name"),
-      "subquery",
-      "gym_set.name = subquery.gym_set2_name AND gym_set.weight = subquery.max_weight"
-    )
-    .limit(LIMIT)
-    .offset(offset || 0)
-    .getMany();
-};
--- a/constants.ts
+++ b/constants.ts
@ -3,4 +3,3 @@ export const PADDING = 10;
 export const ITEM_PADDING = 8;
 export const DARK_RIPPLE = "#444444";
 export const LIGHT_RIPPLE = "#c2c2c2";
-export const LIMIT = 15;
--- a/migrations/1667186124792-plans.ts
+++ b/migrations/1667186124792-plans.ts
@ -5,11 +5,10 @@ export class plans1667186124792 implements MigrationInterface {
    await queryRunner.query(`
    CREATE TABLE IF NOT EXISTS plans (
      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      title TEXT NOT NULL,
      days TEXT NOT NULL,
      workouts TEXT NOT NULL
    )
-`);
+`)
  }

  public async down(queryRunner: QueryRunner): Promise<void> {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "massive",
-  "version": "1.148",
+  "version": "1.147",
  "private": true,
  "license": "GPL-3.0-only",
  "scripts": {
--- a/plan.ts
+++ b/plan.ts
@ -5,9 +5,6 @@ export class Plan {
  @PrimaryGeneratedColumn()
  id?: number;

-  @Column("text")
-  title?: string;
-
  @Column("text")
  days: string;