Skip to content

SF-3644 Update the project font when it changes on sync #3587

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SF-3644 Update the project font when it changes on sync #3587

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
10 changes: 6 additions & 4 deletions src/SIL.XForge.Scripture/ClientApp/src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export class AppComponent extends DataLoadingComponent implements OnInit, OnDest
private isLoggedInUserAnonymous: boolean = false;
private _selectedProjectDoc?: SFProjectProfileDoc;
private selectedProjectDeleteSub?: Subscription;
private permissionsChangedSub?: Subscription;
private selectedProjectChangedSub?: Subscription;
private _isDrawerPermanent: boolean = true;

constructor(
Expand Down Expand Up @@ -343,9 +343,11 @@ export class AppComponent extends DataLoadingComponent implements OnInit, OnDest
}
});

this.permissionsChangedSub?.unsubscribe();
this.permissionsChangedSub = this._selectedProjectDoc?.remoteChanges$.subscribe(() => {
this.selectedProjectChangedSub?.unsubscribe();
this.selectedProjectChangedSub = this._selectedProjectDoc?.remoteChanges$.subscribe(() => {
if (this._selectedProjectDoc?.data != null && this.currentUserDoc != null) {
// Ensure the project font is up to date
this.projectFont = this.fontService.getFontFamilyFromProject(this._selectedProjectDoc.data);
// If the user is in the Serval administration area, do not check access, as they will be modifying the
// project's properties. We suppress this in the event log, as if a sync occurs while a serval admin is
// viewing it, it will result in the project deleted dialog erroneously being shown.
Expand Down Expand Up @@ -391,7 +393,7 @@ export class AppComponent extends DataLoadingComponent implements OnInit, OnDest

ngOnDestroy(): void {
this.selectedProjectDeleteSub?.unsubscribe();
this.permissionsChangedSub?.unsubscribe();
this.selectedProjectChangedSub?.unsubscribe();
}

setLocale(locale: string): void {
Expand Down
Loading