remove results from snapshot

Author: fehmer

frontend/src/ts/collections/results.ts

@@ -144,6 +144,7 @@ export function useResultsLiveQuery(options: {
 
 function normalizeResult(
   result: ResultMinified | SnapshotResult<Mode>,
+  knownTagIds?: Set<string>,
 ): SnapshotResult<Mode> {
   const resultDate = new Date(result.timestamp);
   resultDate.setSeconds(0);
@@ -168,6 +169,9 @@ function normalizeResult(
   result.incompleteTestSeconds ??= 0;
   result.afkDuration ??= 0;
   result.tags ??= [];
+  if (knownTagIds !== undefined) {
+    result.tags = result.tags.filter((tagId) => knownTagIds.has(tagId));
+  }
   result.isPb ??= false;
   return {
     ...result,
@@ -190,6 +194,7 @@ export const resultsCollection = createCollection(
     staleTime: Infinity,
     queryKey: queryKeys.root(),
     queryFn: async () => {
+      const knownTagIds = new Set(getSnapshot()?.tags.map((it) => it._id));
       //const options = parseLoadSubsetOptions(ctx.meta?.loadSubsetOptions);
 
       const response = await Ape.results.get({
@@ -200,7 +205,9 @@ export const resultsCollection = createCollection(
         throw new Error("Error fetching results:" + response.body.message);
       }
 
-      return response.body.data.map((result) => normalizeResult(result));
+      return response.body.data.map((result) =>
+        normalizeResult(result, knownTagIds),
+      );
     },
     onInsert: async ({ transaction }) => {
       //call to the backend to post a result is done outside, we just  insert the result as we get it
@@ -215,6 +222,17 @@ export const resultsCollection = createCollection(
       //do not refetch after insert
       return { refetch: false };
     },
+    onUpdate: async ({ transaction }) => {
+      const updates = transaction.mutations.map((m) => m.modified);
+
+      resultsCollection.utils.writeBatch(() => {
+        updates.forEach((item) => {
+          resultsCollection.utils.writeUpdate(normalizeResult(item));
+        });
+      });
+      //we don't sync local changes back
+      return { refetch: false };
+    },
     queryClient,
     getKey: (it) => it._id,
   }),
@@ -377,34 +395,30 @@ export const getSingleResultQueryOptions = (_id: string) =>
     staleTime: Infinity,
   });
 
-export async function getUserAverage<M extends Mode>(
-  options: {
-    mode: M;
-    mode2: Mode2<M>;
-    punctuation: boolean;
-    numbers: boolean;
-    language: string;
-    difficulty: Difficulty;
-    lazyMode: boolean;
-  } & ExactlyOneTrue<{
-    last10Only: boolean;
-    lastDayOnly: boolean;
-  }>,
+export type CurrentSettingsFilter = {
+  mode: Mode;
+  mode2: Mode2<Mode>;
+  punctuation: boolean;
+  numbers: boolean;
+  language: string;
+  difficulty: Difficulty;
+  lazyMode: boolean;
+};
+
+export async function getUserAverage(
+  options: CurrentSettingsFilter &
+    ExactlyOneTrue<{
+      last10Only: boolean;
+      lastDayOnly: boolean;
+    }>,
 ): Promise<{ wpm: number; acc: number }> {
   const activeTagIds = getSnapshot()
     ?.tags.filter((it) => it.active === true)
     .map((it) => it._id);
 
   const result = await createLiveQueryCollection((q) => {
     let query = q
-      .from({ r: resultsCollection })
-      .where(({ r }) => eq(r.mode, options.mode))
-      .where(({ r }) => eq(r.mode2, options.mode2))
-      .where(({ r }) => eq(r.punctuation, options.punctuation))
-      .where(({ r }) => eq(r.numbers, options.numbers))
-      .where(({ r }) => eq(r.language, options.language))
-      .where(({ r }) => eq(r.difficulty, options.difficulty))
-      .where(({ r }) => eq(r.lazyMode, options.lazyMode))
+      .from({ r: buildSettingsResultsQuery(options) })
       .where(({ r }) =>
         or(
           false,
@@ -427,3 +441,44 @@ export async function getUserAverage<M extends Mode>(
     ? result[0]
     : { wpm: 0, acc: 0 };
 }
+
+export async function findFastestResultByTagId(
+  options: CurrentSettingsFilter & { tagId: string },
+): Promise<SnapshotResult<Mode> | undefined> {
+  const result = await createLiveQueryCollection((q) =>
+    q
+      .from({ r: buildSettingsResultsQuery(options) })
+      .orderBy(({ r }) => r.wpm, "desc")
+      .limit(1)
+      .findOne(),
+  ).toArrayWhenReady();
+  return result.length === 1 || result[0] !== undefined
+    ? (result[0] as SnapshotResult<Mode>)
+    : undefined;
+}
+
+// oxlint-disable-next-line typescript/explicit-function-return-type
+function buildSettingsResultsQuery(filter: CurrentSettingsFilter) {
+  return new Query()
+    .from({ r: resultsCollection })
+    .where(({ r }) => eq(r.mode, filter.mode))
+    .where(({ r }) => eq(r.mode2, filter.mode2))
+    .where(({ r }) => eq(r.punctuation, filter.punctuation))
+    .where(({ r }) => eq(r.numbers, filter.numbers))
+    .where(({ r }) => eq(r.language, filter.language))
+    .where(({ r }) => eq(r.difficulty, filter.difficulty))
+    .where(({ r }) => eq(r.lazyMode, filter.lazyMode));
+}
+
+export function deleteLocalTag(tagId: string): void {
+  for (const result of resultsCollection.values()) {
+    const tagIndex = result.tags.indexOf(tagId);
+    if (tagIndex > -1) {
+      resultsCollection.update(result._id, (old) => {
+        const tags = result.tags;
+        tags.splice(tagIndex, 1);
+        old.tags = tags;
+      });
+    }
+  }
+}

frontend/src/ts/constants/default-snapshot.ts

@@ -76,7 +76,6 @@ export type Snapshot = Omit<
   streakHourOffset?: number;
   tags: SnapshotUserTag[];
   presets: SnapshotPreset[];
-  results?: SnapshotResult<Mode>[];
   xp: number;
   testActivity?: ModifiableTestActivityCalendar;
   testActivityByYear?: { [key: string]: TestActivityCalendar };
@@ -88,7 +87,6 @@ export type SnapshotPreset = Preset & {
 };
 
 const defaultSnap = {
-  results: undefined,
   personalBests: {
     time: {},
     words: {},

frontend/src/ts/controllers/page-controller.ts

@@ -31,6 +31,7 @@ import {
 import { configurationPromise as serverConfigurationPromise } from "../ape/server-configuration";
 import { getSnapshot } from "../db";
 import { resultsCollection } from "../collections/results";
+import * as TodayTracker from "../test/today-tracker";
 
 type ChangeOptions = {
   force?: boolean;
@@ -47,10 +48,10 @@ const pages = {
   account: solidPage("account", {
     loadingOptions: {
       loadingMode: () => {
-        if (getSnapshot()?.results === undefined) {
-          return "sync";
-        } else {
+        if (resultsCollection.isReady()) {
           return "none";
+        } else {
+          return "sync";
         }
       },
       loadingPromise: async () => {
@@ -60,6 +61,7 @@ const pages = {
           );
         }
         await resultsCollection.stateWhenReady();
+        TodayTracker.addAllFromToday();
       },
       style: "bar",
       keyframes: [

frontend/src/ts/db.ts

@@ -4,7 +4,6 @@ import {
   showErrorNotification,
 } from "./states/notifications";
 import { isAuthenticated, getAuthenticatedUser } from "./firebase";
-import { lastElementFromArray } from "./utils/arrays";
 import * as Dates from "date-fns";
 import {
   TestActivityCalendar,
@@ -34,7 +33,10 @@ import {
   get as getServerConfiguration,
 } from "./ape/server-configuration";
 import { Connection } from "@monkeytype/schemas/connections";
-import { insertLocalResult } from "./collections/results";
+import {
+  findFastestResultByTagId,
+  insertLocalResult,
+} from "./collections/results";
 import { resultFilterPresetsCollection } from "./collections/result-filter-presets";
 import {
   setLastResult,
@@ -276,66 +278,6 @@ export async function initSnapshot(): Promise<Snapshot | false> {
   }
 }
 
-export async function getUserResults(offset?: number): Promise<boolean> {
-  if (!isAuthenticated()) return false;
-
-  if (!dbSnapshot) return false;
-  if (
-    dbSnapshot.results !== undefined &&
-    (offset === undefined || dbSnapshot.results.length > offset)
-  ) {
-    return false;
-  }
-
-  const response = await Ape.results.get({ query: { offset } });
-
-  if (response.status !== 200) {
-    showErrorNotification("Error getting results", { response });
-    return false;
-  }
-
-  //another check in case user logs out while waiting for response
-  if (!isAuthenticated()) return false;
-
-  const results: SnapshotResult<Mode>[] = response.body.data.map((result) => {
-    result.bailedOut ??= false;
-    result.blindMode ??= false;
-    result.lazyMode ??= false;
-    result.difficulty ??= "normal";
-    result.funbox ??= [];
-    result.language ??= "english";
-    result.numbers ??= false;
-    result.punctuation ??= false;
-    result.numbers ??= false;
-    result.quoteLength ??= -1;
-    result.restartCount ??= 0;
-    result.incompleteTestSeconds ??= 0;
-    result.afkDuration ??= 0;
-    result.tags ??= [];
-    return result as SnapshotResult<Mode>;
-  });
-  results?.sort((a, b) => b.timestamp - a.timestamp);
-
-  if (dbSnapshot.results !== undefined && dbSnapshot.results.length > 0) {
-    //merge
-    const oldestTimestamp = lastElementFromArray(dbSnapshot.results)
-      ?.timestamp as number;
-    const resultsWithoutDuplicates = results.filter(
-      (it) => it.timestamp < oldestTimestamp,
-    );
-    dbSnapshot.results.push(...resultsWithoutDuplicates);
-  } else {
-    dbSnapshot.results = results;
-  }
-
-  setLastResult(results[0]);
-  return true;
-}
-
-function _getCustomThemeById(themeID: string): CustomTheme | undefined {
-  return dbSnapshot?.customThemes?.find((t) => t._id === themeID);
-}
-
 export async function addCustomTheme(
   theme: Omit<CustomTheme, "_id">,
 ): Promise<boolean> {
@@ -716,20 +658,10 @@ export async function saveLocalTagPB<M extends Mode>(
 
   return;
 }
-
-export function deleteLocalTag(tagId: string): void {
-  getSnapshot()?.results?.forEach((result) => {
-    const tagIndex = result.tags.indexOf(tagId);
-    if (tagIndex > -1) {
-      result.tags.splice(tagIndex, 1);
-    }
-  });
-}
-
-export async function updateLocalTagPB<M extends Mode>(
+export async function updateLocalTagPB(
   tagId: string,
-  mode: M,
-  mode2: Mode2<M>,
+  mode: Mode,
+  mode2: Mode2<Mode>,
   punctuation: boolean,
   numbers: boolean,
   language: Language,
@@ -742,32 +674,24 @@ export async function updateLocalTagPB<M extends Mode>(
 
   if (filteredtag === undefined) return;
 
+  const fastest = await findFastestResultByTagId({
+    tagId,
+    mode,
+    mode2,
+    punctuation,
+    numbers,
+    language,
+    difficulty,
+    lazyMode,
+  });
+
   const pb = {
-    wpm: 0,
-    acc: 0,
-    rawWpm: 0,
-    consistency: 0,
+    wpm: fastest?.wpm ?? 0,
+    acc: fastest?.acc ?? 0,
+    rawWpm: fastest?.rawWpm ?? 0,
+    consistency: fastest?.consistency ?? 0,
   };
 
-  getSnapshot()?.results?.forEach((result) => {
-    if (result.tags.includes(tagId) && result.wpm > pb.wpm) {
-      if (
-        result.mode === mode &&
-        result.mode2 === mode2 &&
-        result.punctuation === punctuation &&
-        result.numbers === numbers &&
-        result.language === language &&
-        result.difficulty === difficulty &&
-        result.lazyMode === lazyMode
-      ) {
-        pb.wpm = result.wpm;
-        pb.acc = result.acc;
-        pb.rawWpm = result.rawWpm;
-        pb.consistency = result.consistency;
-      }
-    }
-  });
-
   await saveLocalTagPB(
     tagId,
     mode,
@@ -833,10 +757,6 @@ export function saveLocalResult(data: SaveLocalResultData): void {
   if (!snapshot) return;
 
   if (data.result !== undefined) {
-    if (snapshot?.results !== undefined) {
-      snapshot.results.unshift(data.result);
-    }
-
     void insertLocalResult(data.result);
     setLastResult(data.result);
     if (snapshot.testActivity !== undefined) {

frontend/src/ts/elements/result-batches.ts

@@ -15,7 +15,8 @@ export function show(): void {
 }
 
 export async function update(): Promise<void> {
-  const results = DB.getSnapshot()?.results;
+  //TODO fix or delete?
+  const results: string[] | undefined = [];
 
   if (results === undefined) {
     console.error(