fix(*): prevent conflicts in progress dashboard component (#1288)

Aam-Digital · Jun 3, 2022 · 506ebdc · 506ebdc
1 parent 5444f69
commit 506ebdc
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 21 deletions.
diff --git a/...eatures/progress-dashboard-widget/progress-dashboard/progress-dashboard.component.spec.ts b/...eatures/progress-dashboard-widget/progress-dashboard/progress-dashboard.component.spec.ts
@@ -13,15 +13,19 @@ import { ProgressDashboardWidgetModule } from "../progress-dashboard-widget.modu
 import { FontAwesomeTestingModule } from "@fortawesome/angular-fontawesome/testing";
 import { ProgressDashboardConfig } from "./progress-dashboard-config";
 import { MatDialog } from "@angular/material/dialog";
-import { Subject } from "rxjs";
+import { BehaviorSubject, Subject } from "rxjs";
 import { take } from "rxjs/operators";
+import { SessionService } from "../../../core/session/session-service/session.service";
+import { SyncState } from "../../../core/session/session-states/sync-state.enum";
 import { MockedTestingModule } from "../../../utils/mocked-testing.module";
 
 describe("ProgressDashboardComponent", () => {
   let component: ProgressDashboardComponent;
   let fixture: ComponentFixture<ProgressDashboardComponent>;
   let mockEntityMapper: jasmine.SpyObj<EntityMapperService>;
   const mockDialog = jasmine.createSpyObj<MatDialog>("matDialog", ["open"]);
+  let mockSession: jasmine.SpyObj<SessionService>;
+  let mockSync: BehaviorSubject<SyncState>;
 
   beforeEach(
     waitForAsync(() => {
@@ -31,6 +35,8 @@ describe("ProgressDashboardComponent", () => {
       ]);
       mockEntityMapper.load.and.resolveTo({ title: "test", parts: [] } as any);
       mockEntityMapper.save.and.resolveTo();
+      mockSync = new BehaviorSubject(SyncState.UNSYNCED);
+      mockSession = jasmine.createSpyObj([], { syncState: mockSync });
 
       TestBed.configureTestingModule({
         imports: [
@@ -41,6 +47,7 @@ describe("ProgressDashboardComponent", () => {
         providers: [
           { provide: EntityMapperService, useValue: mockEntityMapper },
           { provide: MatDialog, useValue: mockDialog },
+          { provide: SessionService, useValue: mockSession },
           {
             provide: AlertService,
             useValue: jasmine.createSpyObj([
@@ -76,8 +83,22 @@ describe("ProgressDashboardComponent", () => {
     );
   }));
 
-  it("should create a new progress dashboard config if no configuration could be found", fakeAsync(() => {
-    mockEntityMapper.load.and.rejectWith({ status: 404 });
+  it("should retry loading the config after sync has finished", fakeAsync(() => {
+    mockEntityMapper.load.and.rejectWith();
+    component.onInitFromDynamicConfig({ dashboardConfigId: "someId" });
+    component.ngOnInit();
+    tick();
+
+    const config = new ProgressDashboardConfig("someId");
+    mockEntityMapper.load.and.resolveTo(config);
+    mockSync.next(SyncState.COMPLETED);
+
+    expect(component.data).toEqual(config);
+  }));
+
+  it("should create a new progress dashboard config if no configuration could be found after initial sync", fakeAsync(() => {
+    mockEntityMapper.load.and.rejectWith();
+    mockSync.next(SyncState.COMPLETED);
     const configID = "config-id";
 
     component.onInitFromDynamicConfig({ dashboardConfigId: configID });

diff --git a/...app/features/progress-dashboard-widget/progress-dashboard/progress-dashboard.component.ts b/...app/features/progress-dashboard-widget/progress-dashboard/progress-dashboard.component.ts
@@ -6,6 +6,9 @@ import { LoggingService } from "../../../core/logging/logging.service";
 import { MatDialog } from "@angular/material/dialog";
 import { EditProgressDashboardComponent } from "../edit-progress-dashboard/edit-progress-dashboard.component";
 import { DynamicComponent } from "../../../core/view/dynamic-components/dynamic-component.decorator";
+import { SessionService } from "../../../core/session/session-service/session.service";
+import { waitForChangeTo } from "../../../core/session/session-states/session-utils";
+import { SyncState } from "../../../core/session/session-states/sync-state.enum";
 
 @Component({
   selector: "app-progress-dashboard",
@@ -21,35 +24,35 @@ export class ProgressDashboardComponent
   constructor(
     private entityMapper: EntityMapperService,
     private loggingService: LoggingService,
-    private dialog: MatDialog
+    private dialog: MatDialog,
+    private sessionService: SessionService
   ) {}
 
   onInitFromDynamicConfig(config: any) {
     this.dashboardConfigId = config.dashboardConfigId;
   }
 
-  ngOnInit() {
+  async ngOnInit() {
     this.data = new ProgressDashboardConfig(this.dashboardConfigId);
-    this.entityMapper
+    this.loadConfigFromDatabase().catch(() =>
+      this.sessionService.syncState
+        .pipe(waitForChangeTo(SyncState.COMPLETED))
+        .toPromise()
+        .then(() => this.loadConfigFromDatabase())
+        .catch(() => this.createDefaultConfig())
+    );
+  }
+
+  private loadConfigFromDatabase() {
+    return this.entityMapper
       .load(ProgressDashboardConfig, this.dashboardConfigId)
-      .then((config) => {
-        this.data = config;
-      })
-      .catch((e) => {
-        if (e.status === 404) {
-          this.loggingService.debug(
-            `ProgressDashboardConfig (${this.dashboardConfigId}) not found. Creating ...`
-          );
-          this.createDefaultConfig();
-        } else {
-          this.loggingService.warn(
-            `Error loading ProgressDashboardConfig (${this.dashboardConfigId}): ${e.message}`
-          );
-        }
-      });
+      .then((config) => (this.data = config));
   }
 
   private createDefaultConfig() {
+    this.loggingService.debug(
+      `ProgressDashboardConfig (${this.dashboardConfigId}) not found. Creating ...`
+    );
     this.data.title = $localize`:The progress, e.g. of a certain activity:Progress of X`;
     this.save();
   }