Skip to content

Cleanup lynx feature state subscriptions #3900

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.

Sign up for GitHub

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

Merged
pmachapman merged 1 commit into from
May 25, 2026
Merged

Cleanup lynx feature state subscriptions #3900

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/SIL.XForge.Scripture/ClientApp/src/app/translate/editor/editor.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ export class EditorComponent extends DataLoadingComponent implements OnDestroy,
private selectionClickSubs: Subscription[] = [];
private noteThreadQuery?: RealtimeQuery<NoteThreadDoc>;
private toggleNoteThreadVerseRefs$: BehaviorSubject<void> = new BehaviorSubject<void>(undefined);
private initializeLynxStateSub?: Subscription;
private targetEditorLoaded$: Subject<void> = new Subject<void>();
private syncScrollRequested$: Subject<void> = new Subject<void>();
private toggleNoteThreadSub?: Subscription;
Expand Down Expand Up @@ -796,9 +797,8 @@ export class EditorComponent extends DataLoadingComponent implements OnDestroy,
);

this.sourceProjectDoc = await this.getSourceProjectDoc();
if (this.projectUserConfigChangesSub != null) {
this.projectUserConfigChangesSub.unsubscribe();
}
this.projectUserConfigChangesSub?.unsubscribe();

this.projectUserConfigChangesSub = this.projectUserConfigDoc.remoteChanges$.subscribe(async () => {
if (this.projectUserConfigDoc?.data != null) {
// Reload config if the checksum has been reset on the server
Expand Down Expand Up @@ -838,9 +838,7 @@ export class EditorComponent extends DataLoadingComponent implements OnDestroy,

if (this.projectDoc.id !== prevProjectId) {
this.setupTranslationEngine();
if (this.projectDataChangesSub != null) {
this.projectDataChangesSub.unsubscribe();
}
this.projectDataChangesSub?.unsubscribe();
this.projectDataChangesSub = this.projectDoc.remoteChanges$.subscribe(() => {
let sourceId: TextDocId | undefined;
if (this.hasSource && this.chapter != null) {
Expand Down Expand Up @@ -935,6 +933,7 @@ export class EditorComponent extends DataLoadingComponent implements OnDestroy,
this.projectUserConfigChangesSub?.unsubscribe();
this.trainingSub?.unsubscribe();
this.projectDataChangesSub?.unsubscribe();
this.initializeLynxStateSub?.unsubscribe();
this.metricsSession?.dispose();
this.onTargetDeleteSub?.unsubscribe();
this.bottomSheet?.dismiss();
Expand Down Expand Up @@ -2669,7 +2668,8 @@ export class EditorComponent extends DataLoadingComponent implements OnDestroy,
* Subscribes to project- and user-level lynx config changes and updates lynx feature states accordingly.
*/
private initLynxFeatureStates(projectUserConfigDoc: SFProjectUserConfigDoc | undefined): void {
combineLatest([
this.initializeLynxStateSub?.unsubscribe();
this.initializeLynxStateSub = combineLatest([
this.canEdit$.pipe(map(canEdit => canEdit ?? false)),
this.activatedProject.changes$.pipe(map(projectDoc => projectDoc?.data?.lynxConfig)),
projectUserConfigDoc?.changes$.pipe(
Expand Down
Loading