fix(playground): remove database loading race condition (#1724)

thm-mni-ii · Jan 18, 2025 · 1a45513 · 1a45513
1 parent 7543a19
commit 1a45513
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/modules/fbs-core/web/src/app/page-components/sql-playground/collab/collab.backend.ts b/modules/fbs-core/web/src/app/page-components/sql-playground/collab/collab.backend.ts
@@ -47,13 +47,15 @@ export class CollaborativeBackend implements Backend {
   }
 
   setMeta(databaseInformation: DatabaseInformation): Observable<void> {
+    //console.log("sm", databaseInformation)
     this.metaMap.set("database", databaseInformation);
     return of();
   }
 
   streamInputChanges(): Observable<ChangeEvent<QueryTab>> {
     return new Observable<ChangeEvent<QueryTab>>((observer) => {
       const handler = (event: Y.YMapEvent<QueryTab>) => {
+        //console.log("ic", event);
         event.changes.keys.forEach((change, key) => {
           let changeEvent: ChangeEvent<QueryTab>;
           if (change.action === "add") {
@@ -126,6 +128,7 @@ export class CollaborativeBackend implements Backend {
   emitInputChange(event: ChangeEvent<QueryTab>): Observable<void> {
     return new Observable<void>((observer) => {
       this.yDoc.transact(() => {
+        //console.log("eic", event)
         if (event.event === "create" || event.event === "update") {
           const currentState = this.inputMap.get(event.payload.id);
           if (!queryTabEquals(currentState, event.payload)) {
@@ -179,6 +182,7 @@ export class CollaborativeBackend implements Backend {
   streamMetaChanges(): Observable<any> {
     return new Observable<{ key: string; value: any }>((observer) => {
       const handler = (event: Y.YMapEvent<any>) => {
+        //console.log("mce", event)
         event.changes.keys.forEach((change, key) => {
           observer.next({
             key,

diff --git a/...re/web/src/app/page-components/sql-playground/db-control-panel/state/databases.effects.ts b/...re/web/src/app/page-components/sql-playground/db-control-panel/state/databases.effects.ts
@@ -40,8 +40,9 @@ export class DatabasesEffects {
   loadDatabases$ = createEffect(() =>
     this.actions$.pipe(
       ofType(loadDatabases),
-      switchMap(() =>
-        this.sqlPlaygroundService.getDatabases(this.token.id).pipe(
+      switchMap(() => {
+        if (!this.token) return;
+        return this.sqlPlaygroundService.getDatabases(this.token.id).pipe(
           switchMap((databases) => {
             if (databases.length == 0) {
               // create default database if none exists
@@ -57,8 +58,8 @@ export class DatabasesEffects {
             }
           }),
           catchError((error) => of(loadDatabasesFailure({ error })))
-        )
-      )
+        );
+      })
     )
   );