fix: relation

AppFlowy-IO · Jul 16, 2024 · b05c202 · b05c202
1 parent 568dcf3
commit b05c202
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/frontend/appflowy_web_app/src/application/services/js-services/index.ts b/frontend/appflowy_web_app/src/application/services/js-services/index.ts
@@ -101,9 +101,7 @@ export class AFClientService implements AFService {
       this.publishViewLoaded.add(name);
     }
 
-    if (!this.cacheDatabaseRowDocMap.has(name)) {
-      this.cacheDatabaseRowDocMap.set(name, rowMapDoc);
-    }
+    this.cacheDatabaseRowDocMap.set(name, rowMapDoc);
 
     return doc;
   }

diff --git a/frontend/appflowy_web_app/src/components/database/components/cell/relation/RelationItems.tsx b/frontend/appflowy_web_app/src/components/database/components/cell/relation/RelationItems.tsx
@@ -9,7 +9,8 @@ import {
 import { RelationCell, RelationCellData } from '@/application/database-yjs/cell.type';
 import { ViewMeta } from '@/application/db/tables/view_metas';
 import { RelationPrimaryValue } from '@/components/database/components/cell/relation/RelationPrimaryValue';
-import React, { useCallback, useContext, useEffect, useState } from 'react';
+import { debounce } from 'lodash-es';
+import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 
 function RelationItems({ style, cell, fieldId }: { cell: RelationCell; fieldId: string; style?: React.CSSProperties }) {
   const viewId = useContext(DatabaseContext)?.iidIndex;
@@ -59,12 +60,20 @@ function RelationItems({ style, cell, fieldId }: { cell: RelationCell; fieldId:
         const { rows } = await getViewRowsMap(relatedViewId);
 
         setRows(rows);
-        handleUpdateRowIds(rows);
       } catch (e) {
         console.error(e);
       }
     })();
-  }, [getViewRowsMap, relatedViewId, relatedFieldId, handleUpdateRowIds]);
+  });
+
+  const debounceUpdateRowIds = useMemo(() => {
+    return debounce(handleUpdateRowIds, 500);
+  }, [handleUpdateRowIds]);
+
+  useEffect(() => {
+    if (!rows) return;
+    debounceUpdateRowIds(rows);
+  }, [rows, debounceUpdateRowIds]);
 
   useEffect(() => {
     const observerHandler = () => (rows ? handleUpdateRowIds(rows) : setRowIds([]));
@@ -80,6 +89,8 @@ function RelationItems({ style, cell, fieldId }: { cell: RelationCell; fieldId:
       try {
         const viewDoc = await loadView?.(relatedViewId);
 
+        console.log('View not loaded, fetching view', relatedViewId);
+
         if (!viewDoc) {
           throw new Error('No access');
         }

diff --git a/...ppflowy_web_app/src/components/database/components/cell/relation/RelationPrimaryValue.tsx b/...ppflowy_web_app/src/components/database/components/cell/relation/RelationPrimaryValue.tsx
@@ -15,9 +15,9 @@ export function RelationPrimaryValue({ rowDoc, fieldId }: { rowDoc: YDoc; fieldI
     };
 
     onRowChange();
-    data?.observe(onRowChange);
+    data?.observeDeep(onRowChange);
     return () => {
-      data?.unobserve(onRowChange);
+      data?.unobserveDeep(onRowChange);
     };
   }, [rowDoc]);