Skip to content

Commit 1257e46

Browse files
committed
chore(client): review from Gemini
1 parent 40a7f28 commit 1257e46

File tree

12 files changed

+37
-62
lines changed

12 files changed

+37
-62
lines changed

apps/client/src/components/app_context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ export class AppContext extends Component {
668668
}
669669

670670
removeBeforeUnloadListener(listener: (() => boolean)) {
671-
this.beforeUnloadListeners = this.beforeUnloadListeners.filter(l => l === listener);
671+
this.beforeUnloadListeners = this.beforeUnloadListeners.filter(l => l !== listener);
672672
}
673673
}
674674

apps/client/src/components/entrypoints.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ export default class Entrypoints extends Component {
175175
return;
176176
}
177177
const { ntxId, note } = noteContext;
178-
console.log("Run active note");
179178

180179
// ctrl+enter is also used elsewhere, so make sure we're running only when appropriate
181180
if (!note || note.type !== "code") {

apps/client/src/services/utils.ts

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -873,29 +873,6 @@ export function getErrorMessage(e: unknown) {
873873
}
874874
}
875875

876-
// TODO: Deduplicate with server
877-
export interface DeferredPromise<T> extends Promise<T> {
878-
resolve: (value: T | PromiseLike<T>) => void;
879-
reject: (reason?: any) => void;
880-
}
881-
882-
// TODO: Deduplicate with server
883-
export function deferred<T>(): DeferredPromise<T> {
884-
return (() => {
885-
let resolve!: (value: T | PromiseLike<T>) => void;
886-
let reject!: (reason?: any) => void;
887-
888-
let promise = new Promise<T>((res, rej) => {
889-
resolve = res;
890-
reject = rej;
891-
}) as DeferredPromise<T>;
892-
893-
promise.resolve = resolve;
894-
promise.reject = reject;
895-
return promise as DeferredPromise<T>;
896-
})();
897-
}
898-
899876
/**
900877
* Handles left or right placement of e.g. tooltips in case of right-to-left languages. If the current language is a RTL one, then left and right are swapped. Other directions are unaffected.
901878
* @param placement a string optionally containing a "left" or "right" value.

apps/client/src/widgets/type_widgets/AiChat.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ export default function AiChat({ note, noteContext }: TypeWidgetProps) {
4040
useEffect(() => {
4141
llmChatPanel.setNoteId(note.noteId);
4242
llmChatPanel.setCurrentNoteId(note.noteId);
43-
console.log("Refresh!");
4443
}, [ note ]);
4544

4645
return ChatWidget;

apps/client/src/widgets/type_widgets/Doc.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export default function Doc({ note, viewScope, ntxId }: TypeWidgetProps) {
2020
}, [ note ]);
2121

2222
useTriliumEvent("executeWithContentElement", async ({ resolve, ntxId: eventNtxId}) => {
23-
console.log("Got request for content ", ntxId, eventNtxId);
2423
if (eventNtxId !== ntxId) return;
2524
await initialized.current;
2625
resolve(refToJQuerySelector(containerRef));

apps/client/src/widgets/type_widgets/text/EditableText.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useEffect, useRef, useState } from "preact/hooks";
22
import dialog from "../../../services/dialog";
33
import toast from "../../../services/toast";
4-
import utils, { deferred, hasTouchBar, isMobile } from "../../../services/utils";
4+
import utils, { hasTouchBar, isMobile } from "../../../services/utils";
55
import { useEditorSpacedUpdate, useKeyboardShortcuts, useLegacyImperativeHandlers, useNoteLabel, useTriliumEvent, useTriliumOption, useTriliumOptionBool } from "../../react/hooks";
66
import { TypeWidgetProps } from "../type_widget";
77
import CKEditorWithWatchdog, { CKEditorApi } from "./CKEditorWithWatchdog";
@@ -17,6 +17,7 @@ import note_create from "../../../services/note_create";
1717
import TouchBar, { TouchBarButton, TouchBarGroup, TouchBarSegmentedControl } from "../../react/TouchBar";
1818
import { RefObject } from "preact";
1919
import { buildSelectedBackgroundColor } from "../../../components/touch_bar";
20+
import { deferred } from "@triliumnext/commons";
2021

2122
/**
2223
* The editor can operate into two distinct modes:
@@ -202,6 +203,7 @@ export default function EditableText({ note, parentComponent, ntxId, noteContext
202203
const customDateTimeFormat = options.get("customDateTimeFormat");
203204
const dateString = utils.formatDateTime(date, customDateTimeFormat);
204205

206+
console.log("Insert text ", ntxId, eventNtxId, dateString);
205207
addTextToEditor(dateString);
206208
});
207209
useTriliumEvent("addTextToActiveEditor", ({ text }) => {

apps/server/src/services/hidden_subtree.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import hiddenSubtreeService from "./hidden_subtree.js";
44
import sql_init from "./sql_init.js";
55
import branches from "./branches.js";
66
import becca from "../becca/becca.js";
7-
import { LOCALES } from "@triliumnext/commons";
7+
import { deferred, LOCALES } from "@triliumnext/commons";
88
import { changeLanguage } from "./i18n.js";
9-
import { deferred } from "./utils.js";
109

1110
describe("Hidden Subtree", () => {
1211
beforeAll(async () => {

apps/server/src/services/sql_init.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import log from "./log.js";
22
import fs from "fs";
33
import resourceDir from "./resource_dir.js";
44
import sql from "./sql.js";
5-
import { isElectron, deferred } from "./utils.js";
5+
import { isElectron } from "./utils.js";
66
import optionService from "./options.js";
77
import port from "./port.js";
88
import BOption from "../becca/entities/boption.js";
99
import TaskContext from "./task_context.js";
1010
import migrationService from "./migration.js";
1111
import cls from "./cls.js";
1212
import config from "./config.js";
13-
import type { OptionRow } from "@triliumnext/commons";
13+
import { deferred, type OptionRow } from "@triliumnext/commons";
1414
import BNote from "../becca/entities/bnote.js";
1515
import BBranch from "../becca/entities/bbranch.js";
1616
import zipImportService from "./import/zip.js";

apps/server/src/services/utils.spec.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -379,14 +379,6 @@ describe("#timeLimit", () => {
379379
});
380380
});
381381

382-
describe("#deferred", () => {
383-
it("should return a promise", () => {
384-
const result = utils.deferred();
385-
expect(result).toBeInstanceOf(Promise);
386-
});
387-
// TriliumNextTODO: Add further tests!
388-
});
389-
390382
describe("#removeDiacritic", () => {
391383
const testCases: TestCase<typeof utils.removeDiacritic>[] = [
392384
[ "w/ 'Äpfel' it should replace the 'Ä'", [ "Äpfel" ], "Apfel" ],

apps/server/src/services/utils.ts

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -229,27 +229,6 @@ export function timeLimit<T>(promise: Promise<T>, limitMs: number, errorMessage?
229229
});
230230
}
231231

232-
export interface DeferredPromise<T> extends Promise<T> {
233-
resolve: (value: T | PromiseLike<T>) => void;
234-
reject: (reason?: any) => void;
235-
}
236-
237-
export function deferred<T>(): DeferredPromise<T> {
238-
return (() => {
239-
let resolve!: (value: T | PromiseLike<T>) => void;
240-
let reject!: (reason?: any) => void;
241-
242-
let promise = new Promise<T>((res, rej) => {
243-
resolve = res;
244-
reject = rej;
245-
}) as DeferredPromise<T>;
246-
247-
promise.resolve = resolve;
248-
promise.reject = reject;
249-
return promise as DeferredPromise<T>;
250-
})();
251-
}
252-
253232
export function removeDiacritic(str: string) {
254233
if (!str) {
255234
return "";
@@ -508,7 +487,6 @@ function slugify(text: string) {
508487
export default {
509488
compareVersions,
510489
crash,
511-
deferred,
512490
envToBoolean,
513491
escapeHtml,
514492
escapeRegExp,

0 commit comments

Comments
 (0)