Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) Fixing code after core merge

Browse Source 
Summary: Fixing code after last core-merge

Test Plan: Existing

Reviewers: JakubSerafin

Reviewed By: JakubSerafin

Subscribers: JakubSerafin

Differential Revision: https://phab.getgrist.com/D4038
This commit is contained in:
Jarosław Sadziński 2023-09-12 11:33:43 +02:00
parent 775b94b15a
commit 75d6b7ab30
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/client/components/LinkingState.ts
View File

@ -90,7 +90,7 @@ export class LinkingState extends Disposable {
// The typical pattern to deal with this is to use `srcColId = col?.colId()`, and test for `if (srcColId) {...}` // The typical pattern to deal with this is to use `srcColId = col?.colId()`, and test for `if (srcColId) {...}`
this.linkTypeDescription = this.autoDispose(ko.computed((): LinkType => { this.linkTypeDescription = this.autoDispose(ko.computed((): LinkType => {
if(srcSection.isDisposed()) { if (srcSection.isDisposed()) {
//srcSection disposed can happen transiently. Can happen when deleting tables and then undoing? //srcSection disposed can happen transiently. Can happen when deleting tables and then undoing?
//nbrowser tests: LinkingErrors and RawData seem to hit this case //nbrowser tests: LinkingErrors and RawData seem to hit this case
console.warn("srcSection disposed in linkingState: linkTypeDescription"); console.warn("srcSection disposed in linkingState: linkTypeDescription");
@ -307,6 +307,12 @@ export class LinkingState extends Disposable {
//Now, create the actual observable that updates with activeRowId //Now, create the actual observable that updates with activeRowId
//(we autodispose/return it at the end of the function) is this right? TODO JV //(we autodispose/return it at the end of the function) is this right? TODO JV
return owner.autoDispose(ko.computed(() => { return owner.autoDispose(ko.computed(() => {
if (this._srcSection.isDisposed()) {
//srcSection disposed can happen transiently. Can happen when deleting tables and then undoing?
//nbrowser tests: LinkingErrors and RawData seem to hit this case
console.warn("srcSection disposed in LinkingState._makeFilterObs");
return EmptyFilterState;
}
//Get selector-rowId //Get selector-rowId
const srcRowId = this._srcSection.activeRowId(); const srcRowId = this._srcSection.activeRowId();

2
app/client/models/entities/ViewSectionRec.ts
View File

@ -631,7 +631,7 @@ export function createViewSectionRec(this: ViewSectionRec, docModel: DocModel):
} catch (err) { } catch (err) {
console.warn(err); console.warn(err);
// Dispose old LinkingState in case creating the new one failed. // Dispose old LinkingState in case creating the new one failed.
this._linkingState.dispose(); this._linkingState.clear();
return null; return null;
} }
})); }));