chore: fix missing group key (#253)

* chore: fix missing group key

* chore: lint

Author: appflowy

src/application/database-yjs/dispatch.ts

@@ -173,6 +173,7 @@ function generateGroupByField(field: YDatabaseField) {
 
   group.set(YjsDatabaseKey.field_id, fieldId);
   group.set(YjsDatabaseKey.id, `g:${nanoid(6)}`);
+  group.set(YjsDatabaseKey.type, fieldType);
 
   switch (fieldType) {
     case FieldType.SingleSelect:

src/application/database-yjs/dispatch/group.ts

@@ -46,6 +46,7 @@ function generateGroupByField(field: YDatabaseField) {
 
   group.set(YjsDatabaseKey.field_id, fieldId);
   group.set(YjsDatabaseKey.id, `g:${nanoid(6)}`);
+  group.set(YjsDatabaseKey.type, fieldType);
 
   switch (fieldType) {
     case FieldType.SingleSelect:

src/application/types.ts

@@ -348,6 +348,11 @@ export enum YjsDatabaseKey {
   data = 'data',
   iid = 'iid',
   database_id = 'database_id',
+  is_two_way = 'is_two_way',
+  reciprocal_field_id = 'reciprocal_field_id',
+  reciprocal_field_name = 'reciprocal_field_name',
+  source_limit = 'source_limit',
+  target_limit = 'target_limit',
   relation_field_id = 'relation_field_id',
   target_field_id = 'target_field_id',
   calculation_type = 'calculation_type',
@@ -378,12 +383,14 @@ export enum YjsDatabaseKey {
   calculations = 'calculations',
   field_id = 'field_id',
   calculation_value = 'calculation_value',
+  cv = 'cv',
   source_field_type = 'source_field_type', // Added this
   condition = 'condition',
   schema_version = 'schema_version',
   format = 'format',
   filter_type = 'filter_type',
   visible = 'visible',
+  collapsed_group_ids = 'collapsed_group_ids',
   hide_ungrouped_column = 'hide_ungrouped_column',
   collapse_hidden_groups = 'collapse_hidden_groups',
   first_day_of_week = 'first_day_of_week',
@@ -667,10 +674,14 @@ export interface YDatabaseGroup extends Y.Map<unknown> {
 
   get(key: YjsDatabaseKey.field_id): FieldId;
 
+  get(key: YjsDatabaseKey.type): number | string;
+
   // eslint-disable-next-line @typescript-eslint/unified-signatures
   get(key: YjsDatabaseKey.content): string; // "{"hide_empty":false,"condition":2}"
 
   get(key: YjsDatabaseKey.groups): YDatabaseGroupColumns;
+
+  get(key: YjsDatabaseKey.collapsed_group_ids): Y.Array<string> | string[] | undefined;
 }
 
 export type YDatabaseGroupColumns = Y.Array<{ id: string; visible: boolean }>;
@@ -704,7 +715,11 @@ export interface YDatabaseFilter extends Y.Map<unknown> {
 export interface YDatabaseCalculation extends Y.Map<unknown> {
   get(key: YjsDatabaseKey.field_id): FieldId;
 
-  get(key: YjsDatabaseKey.id | YjsDatabaseKey.type | YjsDatabaseKey.calculation_value): string;
+  get(key: YjsDatabaseKey.id | YjsDatabaseKey.cv): string;
+
+  get(key: YjsDatabaseKey.type): string | number;
+
+  get(key: YjsDatabaseKey.calculation_value): string | number | undefined;
 }
 
 export interface YDatabaseFieldSettings extends Y.Map<unknown> {
@@ -762,6 +777,8 @@ export interface YMapFieldTypeOption extends Y.Map<unknown> {
       | YjsDatabaseKey.condition_value
   ): string;
 
+  get(key: YjsDatabaseKey.reciprocal_field_id | YjsDatabaseKey.reciprocal_field_name): string | undefined;
+
   // CreatedTime, LastEditedTime, DateTime
   // eslint-disable-next-line @typescript-eslint/unified-signatures
   get(key: YjsDatabaseKey.time_format): string | undefined;
@@ -773,15 +790,16 @@ export interface YMapFieldTypeOption extends Y.Map<unknown> {
   // Relation
   get(key: YjsDatabaseKey.database_id): DatabaseId;
 
+  get(key: YjsDatabaseKey.is_two_way | YjsDatabaseKey.include_time): boolean;
+
+  get(key: YjsDatabaseKey.source_limit | YjsDatabaseKey.target_limit): number | undefined;
+
   get(key: YjsDatabaseKey.calculation_type | YjsDatabaseKey.show_as): number;
 
   // Number
   // eslint-disable-next-line @typescript-eslint/unified-signatures
   get(key: YjsDatabaseKey.format): string;
 
-  // LastEditedTime and CreatedTime
-  get(key: YjsDatabaseKey.include_time): boolean;
-
   // AI Translate
   // eslint-disable-next-line @typescript-eslint/unified-signatures
   get(key: YjsDatabaseKey.auto_fill): boolean;

src/components/database/components/database-row/DatabaseRowSubDocument.tsx

@@ -130,7 +130,7 @@ export const DatabaseRowSubDocument = memo(({ rowId }: { rowId: string }) => {
   // undefined = meta hasn't loaded from Yjs yet (wait)
   // true = meta loaded, document is empty (open locally)
   // false = meta loaded, document has content (load from server)
-  const isDocumentEmptyResolved = meta == null ? undefined : (meta.isEmptyDocument ?? true);
+  const isDocumentEmptyResolved = meta === null || meta === undefined ? undefined : (meta.isEmptyDocument ?? true);
 
   const isDocumentEmpty = useCallback(
     (editor: YjsEditor) => {

src/components/database/components/grid/grid-cell/GridCalculateRowCell.tsx

@@ -40,7 +40,7 @@ export function GridCalculateRowCell ({ fieldId }: GridCalculateRowCellProps) {
     setCalculation({
       id: item.get(YjsDatabaseKey.id),
       fieldId: item.get(YjsDatabaseKey.field_id),
-      value: item.get(YjsDatabaseKey.calculation_value),
+      value: String(item.get(YjsDatabaseKey.calculation_value) ?? ''),
       type: Number(item.get(YjsDatabaseKey.type)) as CalculationType,
     });
   }, [calculations, fieldId]);