Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core: added note title to noteHistory for saving sessions #4405

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion apps/web/src/components/editor/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import { getFormattedDate } from "@notesnook/common";
const PDFPreview = React.lazy(() => import("../pdf-preview"));

type PreviewSession = {
content: { data: string; type: string };
content: { data: string; type: string; title: string };
dateCreated: number;
dateEdited: number;
};
Expand Down Expand Up @@ -108,6 +108,7 @@ export default function EditorManager({
const arePropertiesVisible = useStore((store) => store.arePropertiesVisible);
const toggleProperties = useStore((store) => store.toggleProperties);
const isReadonly = useStore((store) => store.session.readonly);
const setPreviewTitle = useStore((store) => store.setPreviewTitle);
const isFocusMode = useAppStore((store) => store.isFocusMode);
const isPreviewSession = !!previewSession.current;

Expand Down Expand Up @@ -157,6 +158,7 @@ export default function EditorManager({
const openSession = useCallback(async (noteId: string | number) => {
await editorstore.get().openSession(noteId);
previewSession.current = undefined;
setPreviewTitle(undefined);

lastSavedTime.current = Date.now();
setTimestamp(Date.now());
Expand Down Expand Up @@ -228,6 +230,7 @@ export default function EditorManager({
onOpenPreviewSession={async (session: PreviewSession) => {
previewSession.current = session;
setTimestamp(Date.now());
setPreviewTitle(previewSession.current.content.title);
}}
/>
)}
Expand Down
5 changes: 3 additions & 2 deletions apps/web/src/components/editor/title-box.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ function TitleBox(props: TitleBoxProps) {
const { readonly } = props;
const inputRef = useRef<HTMLInputElement>(null);
const id = useStore((store) => store.session.id);
const previewTitle = useStore((store) => store.previewTitle);
const isMobile = useMobile();
const isTablet = useTablet();
const { editorConfig } = useEditorConfig();
Expand All @@ -63,9 +64,9 @@ function TitleBox(props: TitleBoxProps) {
useEffect(() => {
if (!inputRef.current) return;
const { title } = useStore.getState().session;
inputRef.current.value = title;
inputRef.current.value = previewTitle || title;
updateFontSize(title.length);
}, [id, updateFontSize]);
}, [id, updateFontSize, previewTitle]);

useEffect(() => {
if (!inputRef.current) return;
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/properties/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ function Properties(props) {
title="Click to preview"
onClick={async () => {
toggleProperties(false);
const content = await db.noteHistory.content(session.id);
const content = await db.noteHistory.content(session.id);

if (session.locked) {
await Vault.askPassword(async (password) => {
Expand Down
14 changes: 13 additions & 1 deletion apps/web/src/stores/editor-store.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class EditorStore extends BaseStore {
session = getDefaultSession();
arePropertiesVisible = false;
editorMargins = Config.get("editor:margins", true);
previewTitle = undefined;

init = () => {
EV.subscribe(EVENTS.userLoggedOut, () => {
Expand Down Expand Up @@ -316,7 +317,12 @@ class EditorStore extends BaseStore {
*/
saveSessionContent = (noteId, sessionId, ignoreEdit, content) => {
const dateEdited = ignoreEdit ? this.get().session.dateEdited : undefined;
return this.saveSession(noteId, { sessionId, content, dateEdited });
return this.saveSession(noteId, {
sessionId,
content,
dateEdited,
title: content.title
});
};

setTag = (tag) => {
Expand All @@ -329,6 +335,12 @@ class EditorStore extends BaseStore {
});
};

setPreviewTitle = (previewTitle) => {
this.set((state) => {
state.previewTitle = previewTitle;
});
};

toggleProperties = (toggleState) => {
this.set(
(state) =>
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/collections/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ export default class Content extends Collection {
if (content.sessionId) {
await this._db.noteHistory.add(contentItem.noteId, content.sessionId, {
data: contentItem.data,
type: contentItem.type
type: contentItem.type,
title: content.title
});
}
return id;
Expand Down
2 changes: 2 additions & 0 deletions packages/core/src/collections/note-history.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import SessionContent from "./session-content";

/**
* @typedef Content
* @property {string} title
* @property {string} data
* @property {string} type
*/
Expand Down Expand Up @@ -91,6 +92,7 @@ export default class NoteHistory extends Collection {
id: sessionId,
sessionContentId: makeSessionContentId(sessionId),
noteId,
title: content.title,
dateCreated: oldSession ? oldSession.dateCreated : Date.now(),
localOnly: true
};
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/collections/notes.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export default class Notes extends Collection {

note.contentId = await this._db.content.add({
noteId: id,
title: note.title,
sessionId: note.sessionId,
id: note.contentId,
type,
Expand Down
8 changes: 5 additions & 3 deletions packages/core/src/collections/session-content.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@ export default class SessionContent extends Collection {
contentType: content.type,
compressed: !locked,
localOnly: true,
locked
locked,
title: content.title
});
}

/**
*
* @param {string} sessionId
* @returns {Promise<{content:string;data:string}>}
* @returns {Promise<{content:string;data:string;title:string}>}
*/
async get(sessionContentId) {
if (!sessionContentId) return;
Expand All @@ -69,7 +70,8 @@ export default class SessionContent extends Collection {
data: session.compressed
? await this._db.compressor.decompress(session.data)
: session.data,
type: session.contentType
type: session.contentType,
title: session.title
};
}

Expand Down
Loading