diff --git a/app/client/components/Cursor.ts b/app/client/components/Cursor.ts index 947d1c39..74a90293 100644 --- a/app/client/components/Cursor.ts +++ b/app/client/components/Cursor.ts @@ -156,7 +156,8 @@ export class Cursor extends Disposable { public setCursorPos(cursorPos: CursorPos, silentUpdate: boolean = false): void { //If updating as a result of links, we want to NOT update lastEditedAt if(silentUpdate) { this._silentUpdatesFlag = true; } - //console.log(`CURSOR: ${silentUpdate}, silentUpdate=${this._silentUpdatesFlag}, lastUpdated = ${this.lastUpdated.peek()}`) //TODO JV DEBUG TEMP + //console.log(`CURSOR: ${silentUpdate}, silentUpdate=${this._silentUpdatesFlag}, + // lastUpdated = ${this.lastUpdated.peek()}`) //TODO JV DEBUG TEMP if (cursorPos.rowId !== undefined && this.viewData.getRowIndex(cursorPos.rowId) >= 0) { this.rowIndex(this.viewData.getRowIndex(cursorPos.rowId) ); @@ -170,7 +171,8 @@ export class Cursor extends Disposable { this.fieldIndex(cursorPos.fieldIndex); } - //console.log(`CURSOR-END: silentUpdate=${this._silentUpdatesFlag}, lastEditedAt = ${this._lastEditedAt.peek()} `); //TODO JV DEBUG TEMP + //console.log(`CURSOR-END: silentUpdate=${this._silentUpdatesFlag}, + // lastEditedAt = ${this._lastEditedAt.peek()} `); //TODO JV DEBUG TEMP this._silentUpdatesFlag = false; } diff --git a/app/client/components/LinkingState.ts b/app/client/components/LinkingState.ts index 5594e0af..6d9b0483 100644 --- a/app/client/components/LinkingState.ts +++ b/app/client/components/LinkingState.ts @@ -78,7 +78,7 @@ export class LinkingState extends Disposable { private _docModel: DocModel; private _srcSection: ViewSectionRec; - private _tgtSection: ViewSectionRec; + //private _tgtSection: ViewSectionRec; private _srcTableModel: DataTableModel; private _srcColId: string | undefined; @@ -87,12 +87,13 @@ export class LinkingState extends Disposable { const {srcSection, srcCol, srcColId, tgtSection, tgtCol, tgtColId} = linkConfig; this._docModel = docModel; this._srcSection = srcSection; - this._tgtSection = tgtSection; + //this._tgtSection = tgtSection; this._srcColId = srcColId; this._srcTableModel = docModel.dataTables[srcSection.table().tableId()]; const srcTableData = this._srcTableModel.tableData; - console.log(`============ LinkingState: Re-running constructor; tgtSec:${tgtSection.id()}: ${tgtSection.titleDef()}`); //TODO JV TEMP; + //TODO JV TEMP; + console.log(`======= LinkingState: Re-running constructor; tgtSec:${tgtSection.id()}: ${tgtSection.titleDef()}`); // === IMPORTANT NOTE! (this applies throughout this file) @@ -221,7 +222,8 @@ export class LinkingState extends Disposable { (prevLink.linkTypeDescription() == "Cursor:Same-Table" || prevLink.linkTypeDescription() == "Cursor:Reference"); - const [prevLinkedPos, prevLinkedVersion] = prevLinkHasCursor ? prevLink.incomingCursorPos(): [null, SequenceNEVER]; + const [prevLinkedPos, prevLinkedVersion] = prevLinkHasCursor ? prevLink.incomingCursorPos() : + [null, SequenceNEVER]; const srcSecPos = this._srcSection.activeRowId.peek(); //we don't depend on this, only on its cursor version const srcSecVersion = this._srcSection.lastCursorEdit(); @@ -258,8 +260,7 @@ export class LinkingState extends Disposable { //This is the cursorPos that's directly applied to tgtSection, should be null if incoming link is outdated //where null means "cursorPos does not apply to tgtSection and should be ignored" this.cursorPos = this.autoDispose(ko.computed(() => { - const [incomingPos, _]: [UIRowId|null, SequenceNum] = this.incomingCursorPos(); - return incomingPos; + return this.incomingCursorPos()[0]; //TODO JV: this is ugly and probably not needed // TODO JV: old code only accepted incomingPos if it was newer than tgtSec. // However I think we'll be ok with always taking incomingPos. I think the only weird case