Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2026-03-02 04:09:24 +00:00
Code Issues Projects Releases Wiki Activity

(core) Storing last position for doc and user

Browse Source 
Summary: Last position should be stored for document and user.

Test Plan: Updated tests

Reviewers: georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D3143
This commit is contained in:
Jarosław Sadziński
2021-11-18 23:54:37 +01:00
parent c6aa9b65d4
commit fc50079e03
3 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/client/components/CursorMonitor.ts
View File

@@ -18,8 +18,8 @@ export class CursorMonitor extends Disposable {
// abstraction to work with local storage
private _store: StorageWrapper;
// document id that this monitor is attached
private _docId: string;
// key for storing position in the memory (docId + userId)
private _key: string;
// flag that tells if the position was already restored
// we track document's view change event, so we only want
// to react to that event once
@@ -31,7 +31,10 @@ export class CursorMonitor extends Disposable {
super();
this._store = new StorageWrapper(store);
this._docId = doc.docId();
// Use document id and user id as a key for storage.
const userId = doc.app.topAppModel.appObs.get()?.currentUser?.id ?? null;
this._key = doc.docId() + userId;
/**
* When document loads last cursor position should be restored from local storage.
@@ -77,12 +80,12 @@ export class CursorMonitor extends Disposable {
}
private _storePosition(pos: ViewCursorPos) {
this._store.update(this._docId, pos);
this._store.update(this._key, pos);
}
private _restoreLastPosition(view: IDocPage) {
const lastPosition = this._store.read(this._docId);
this._store.clear(this._docId);
const lastPosition = this._store.read(this._key);
this._store.clear(this._key);
if (lastPosition && lastPosition.position.viewId == view) {
return lastPosition.position;
}

21
app/client/components/EditorMonitor.ts
View File

@@ -22,7 +22,10 @@ export class EditorMonitor extends Disposable {
super();
// create store
this._store = new EditMemoryStorage(doc.docId(), store);
const userId = doc.app.topAppModel.appObs.get()?.currentUser?.id ?? null;
// use document id and user id as a key for storage
const key = doc.docId() + userId;
this._store = new EditMemoryStorage(key, store);
// listen to document events to handle view load event
this._listenToReload(doc);
@@ -58,8 +61,8 @@ export class EditorMonitor extends Disposable {
// will be invoked only once
let executed = false;
// don't restore on readonly mode
if (doc.isReadonly.get()) { return; }
// don't restore on readonly mode or when there is custom nav
if (doc.isReadonly.get() || doc.hasCustomNav.get()) { return; }
// on view shown
this._currentViewListener.autoDispose(doc.currentView.addListener(async view => {
@@ -114,7 +117,7 @@ class EditMemoryStorage {
private _entry: LastEditData | null = null;
private _timestamp = 0;
constructor(private _docId: string, private _storage = getStorage()) {
constructor(private _key: string, private _storage = getStorage()) {
}
public updateValue(pos: CellPosition, value: EditorState): void {
@@ -136,13 +139,13 @@ class EditMemoryStorage {
return this._timestamp;
}
protected _key() {
return `grist-last-edit-${this._docId}`;
protected _storageKey() {
return `grist-last-edit-${this._key}`;
}
protected load() {
const storage = this._storage;
const data = storage.getItem(this._key());
const data = storage.getItem(this._storageKey());
this._entry = null;
this._timestamp = 0;
@@ -166,14 +169,14 @@ class EditMemoryStorage {
// if entry was removed - clear the storage
if (!this._entry) {
storage.removeItem(this._key());
storage.removeItem(this._storageKey());
return;
}
try {
this._timestamp = Date.now();
const data = { timestamp: this._timestamp, entry: this._entry };
storage.setItem(this._key(), JSON.stringify(data));
storage.setItem(this._storageKey(), JSON.stringify(data));
} catch (ex) {
console.error("Can't save current edited cell state. Error message: " + ex?.message);
}