Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
fix(web): stamp new memos with the time of saving under a date filter (#6457)
Johnnya668bb8f7e36
diff --git a/web/src/components/MemoEditor/hooks/useMemoSave.ts b/web/src/components/MemoEditor/hooks/useMemoSave.tsindex 2e9f4fb2a..27106817b 100644--- a/web/src/components/MemoEditor/hooks/useMemoSave.ts+++ b/web/src/components/MemoEditor/hooks/useMemoSave.ts@@ -11,6 +11,7 @@ import type { Visibility } from "@/types/proto/api/memo_service_pb";import { useTranslate } from "@/utils/i18n";import { errorService, memoService, validationService } from "../services";import { useEditorContext } from "../state";+import { restampDefaultCreateTime } from "../utils/deriveDefaultCreateTime";/** How long a closing host shows "Saved" before it unmounts the editor. */const SAVED_CONFIRMATION_MS = 900;@@ -78,12 +79,24 @@ export function useMemoSave({};try {- const result = await memoService.save(state, {- memoName,- parentMemoName,- space: defaultSpace,- onFileUploaded: (file, attachment) => uploaded.set(file.previewUrl, attachment),- });+ // A new memo composed on a selected day keeps the day but is stamped with+ // the time of saving, so consecutive memos do not share one createTime.+ const now = new Date();+ const timestamps = memoName+ ? state.timestamps+ : {+ createTime: restampDefaultCreateTime(state.timestamps.createTime, defaultCreateTime, now),+ updateTime: restampDefaultCreateTime(state.timestamps.updateTime, defaultCreateTime, now),+ };+ const result = await memoService.save(+ { ...state, timestamps },+ {+ memoName,+ parentMemoName,+ space: defaultSpace,+ onFileUploaded: (file, attachment) => uploaded.set(file.previewUrl, attachment),+ },+ );if (!result.hasChanges) {toast.error(t("editor.no-changes-detected"));diff --git a/web/src/components/MemoEditor/utils/deriveDefaultCreateTime.ts b/web/src/components/MemoEditor/utils/deriveDefaultCreateTime.tsindex 47a7640ef..f4764a0a5 100644--- a/web/src/components/MemoEditor/utils/deriveDefaultCreateTime.ts+++ b/web/src/components/MemoEditor/utils/deriveDefaultCreateTime.ts@@ -20,6 +20,28 @@ export function deriveDefaultCreateTimeFromFilters(filters: MemoFilter[], now: Dexport function deriveDefaultCreateTimeFromDate(value: string, now: Date = new Date()): Date | undefined {const date = parseLocalDate(value);if (!date) return undefined;- date.setHours(now.getHours(), now.getMinutes(), now.getSeconds());- return date;+ return withTimeOfDay(date, now);+}++/** A copy of `date` whose wall-clock hh:mm:ss is taken from `now`; the calendar day is kept. */+export function withTimeOfDay(date: Date, now: Date = new Date()): Date {+ const next = new Date(date);+ next.setHours(now.getHours(), now.getMinutes(), now.getSeconds(), 0);+ return next;+}++/**+ * The timestamp to send when a new memo is saved. A derived default is computed once+ * when the host selects a day and then held for every memo composed there, so if the+ * editor still carries that untouched default (same reference; the timestamp popover+ * dispatches a fresh `Date`), its time of day is re-stamped from `now` so consecutive+ * saves keep their order within the selected day. Anything else is returned as is.+ */+export function restampDefaultCreateTime(+ time: Date | undefined,+ defaultCreateTime: Date | undefined,+ now: Date = new Date(),+): Date | undefined {+ if (!time || !defaultCreateTime || time !== defaultCreateTime) return time;+ return withTimeOfDay(time, now);}diff --git a/web/tests/derive-default-create-time.test.ts b/web/tests/derive-default-create-time.test.tsindex 0700d56d7..19437d62e 100644--- a/web/tests/derive-default-create-time.test.ts+++ b/web/tests/derive-default-create-time.test.ts@@ -1,5 +1,10 @@import { describe, expect, it } from "vitest";-import { deriveDefaultCreateTimeFromFilters } from "@/components/MemoEditor/utils/deriveDefaultCreateTime";+import {+ deriveDefaultCreateTimeFromDate,+ deriveDefaultCreateTimeFromFilters,+ restampDefaultCreateTime,+ withTimeOfDay,+} from "@/components/MemoEditor/utils/deriveDefaultCreateTime";import type { MemoFilter } from "@/contexts/MemoFilterContext";describe("deriveDefaultCreateTimeFromFilters", () => {@@ -73,3 +78,42 @@ describe("deriveDefaultCreateTimeFromFilters", () => {}});});++describe("withTimeOfDay", () => {+ const now = new Date(2026, 9, 6, 13, 17, 23, 456);++ it("keeps the day and replaces the time of day without mutating the input", () => {+ const day = new Date(2026, 9, 1, 8, 0, 0);+ expect(withTimeOfDay(day, now)).toEqual(new Date(2026, 9, 1, 13, 17, 23));+ expect(day).toEqual(new Date(2026, 9, 1, 8, 0, 0));+ });+});++describe("restampDefaultCreateTime", () => {+ const now = new Date(2026, 9, 6, 13, 17, 23);+ const defaultCreateTime = deriveDefaultCreateTimeFromDate("2026-10-01", now) as Date;++ it("re-stamps an untouched default with the time of saving", () => {+ const later = new Date(2026, 9, 6, 13, 18, 10);+ expect(restampDefaultCreateTime(defaultCreateTime, defaultCreateTime, later)).toEqual(new Date(2026, 9, 1, 13, 18, 10));+ });++ it("gives consecutive saves distinct, ordered times within the selected day", () => {+ const first = restampDefaultCreateTime(defaultCreateTime, defaultCreateTime, new Date(2026, 9, 6, 13, 17, 40)) as Date;+ const second = restampDefaultCreateTime(defaultCreateTime, defaultCreateTime, new Date(2026, 9, 6, 13, 17, 55)) as Date;+ expect(first.getTime()).toBeLessThan(second.getTime());+ expect(first.getDate()).toBe(1);+ expect(second.getDate()).toBe(1);+ });++ it("leaves a manually edited timestamp alone", () => {+ const edited = new Date(2026, 8, 20, 9, 30, 0);+ expect(restampDefaultCreateTime(edited, defaultCreateTime, now)).toBe(edited);+ });++ it("passes through when there is no default or no timestamp", () => {+ expect(restampDefaultCreateTime(undefined, defaultCreateTime, now)).toBeUndefined();+ const time = new Date(2026, 8, 20, 9, 30, 0);+ expect(restampDefaultCreateTime(time, undefined, now)).toBe(time);+ });+});diff --git a/web/tests/use-memo-save.test.tsx b/web/tests/use-memo-save.test.tsxindex cb227bce7..d36ac142a 100644--- a/web/tests/use-memo-save.test.tsx+++ b/web/tests/use-memo-save.test.tsx@@ -9,6 +9,7 @@ const mocks = vi.hoisted(() => ({markNewMemo: vi.fn(),memoSave: vi.fn(),newMemoName: null as string | null,+ timestamps: {} as { createTime?: Date; updateTime?: Date },}));vi.mock("@/components/MemoEditor/services", () => ({@@ -27,7 +28,7 @@ vi.mock("@/components/MemoEditor/state", () => ({setTimestamps: () => ({ type: "set-timestamps" }),},dispatch: mocks.dispatch,- getState: () => ({ ui: { justSaved: false } }),+ getState: () => ({ ui: { justSaved: false }, timestamps: mocks.timestamps }),}),}));@@ -45,6 +46,7 @@ describe("useMemoSave", () => {mocks.markNewMemo.mockReset();mocks.memoSave.mockReset();mocks.newMemoName = null;+ mocks.timestamps = {};mocks.markNewMemo.mockImplementation((value: string | null | ((current: string | null) => string | null)) => {mocks.newMemoName = typeof value === "function" ? value(mocks.newMemoName) : value;});@@ -153,6 +155,44 @@ describe("useMemoSave", () => {expect(mocks.markNewMemo).not.toHaveBeenCalled();});+ it("stamps an untouched default create time with the time of saving", async () => {+ vi.useFakeTimers({ now: new Date(2026, 9, 6, 13, 17, 40), toFake: ["Date"] });+ try {+ // Derived when the day was selected; the same reference stays in state across saves.+ const defaultCreateTime = new Date(2026, 9, 1, 13, 17, 23);+ mocks.timestamps = { createTime: defaultCreateTime, updateTime: defaultCreateTime };+ mocks.memoSave.mockResolvedValue({ hasChanges: true, memoName: "memos/new" });+ const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });+ const wrapper = ({ children }: PropsWithChildren) => <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>;+ const { result } = renderHook(() => useMemoSave({ defaultCreateTime, discardDraft: vi.fn() }), { wrapper });++ await act(async () => result.current());+ vi.setSystemTime(new Date(2026, 9, 6, 13, 17, 55));+ await act(async () => result.current());++ const sent = mocks.memoSave.mock.calls.map(([state]) => state.timestamps.createTime as Date);+ expect(sent[0]).toEqual(new Date(2026, 9, 1, 13, 17, 40));+ expect(sent[1]).toEqual(new Date(2026, 9, 1, 13, 17, 55));+ expect(defaultCreateTime).toEqual(new Date(2026, 9, 1, 13, 17, 23));+ } finally {+ vi.useRealTimers();+ }+ });++ it("sends a manually edited create time unchanged", async () => {+ const defaultCreateTime = new Date(2026, 9, 1, 13, 17, 23);+ const edited = new Date(2026, 8, 20, 9, 30, 0);+ mocks.timestamps = { createTime: edited, updateTime: edited };+ mocks.memoSave.mockResolvedValue({ hasChanges: true, memoName: "memos/new" });+ const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });+ const wrapper = ({ children }: PropsWithChildren) => <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>;+ const { result } = renderHook(() => useMemoSave({ defaultCreateTime, discardDraft: vi.fn() }), { wrapper });++ await act(async () => result.current());++ expect(mocks.memoSave.mock.calls[0][0].timestamps.createTime).toBe(edited);+ });+it("does not hold the in-place composer after saving a new memo", async () => {mocks.memoSave.mockResolvedValue({ hasChanges: true, memoName: "memos/new" });const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } });