Skip to content

Commit 840095d

Browse files
authored
fix: create grid for each test (#1431)
1 parent bbd64fa commit 840095d

File tree

5 files changed

+24
-15
lines changed

5 files changed

+24
-15
lines changed

frontend/app_flowy/lib/plugins/grid/application/grid_data_controller.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,9 @@ class GridDataController {
105105
fieldController: fieldController,
106106
);
107107

108-
cache.addListener(
109-
onRowsChanged: (reason) {
110-
_onRowChanged?.call(rowInfos, reason);
111-
},
112-
);
108+
cache.addListener(onRowsChanged: (reason) {
109+
_onRowChanged?.call(rowInfos, reason);
110+
});
113111

114112
_blocks[block.id] = cache;
115113
}

frontend/app_flowy/lib/plugins/grid/application/row/row_cache.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,7 @@ class GridRowCache {
145145

146146
void _showRows(List<String> visibleRows) {}
147147

148-
void onRowsChanged(
149-
void Function(RowsChangedReason) onRowChanged,
150-
) {
148+
void onRowsChanged(void Function(RowsChangedReason) onRowChanged) {
151149
_rowChangeReasonNotifier.addListener(() {
152150
onRowChanged(_rowChangeReasonNotifier.reason);
153151
});

frontend/app_flowy/test/bloc_test/grid_test/grid_bloc_test.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ void main() {
77
late AppFlowyGridTest gridTest;
88
setUpAll(() async {
99
gridTest = await AppFlowyGridTest.ensureInitialized();
10-
await gridTest.createTestGrid();
1110
});
1211

13-
group('Create a new row in Grid', () {
12+
group('Edit Grid:', () {
13+
setUp(() async {
14+
await gridTest.createTestGrid();
15+
});
16+
// The initial number of rows is 3 for each grid.
1417
blocTest<GridBloc, GridState>(
1518
"create a row",
1619
build: () =>

frontend/app_flowy/test/bloc_test/grid_test/util.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,17 @@ class AppFlowyGridTest {
171171
(view) async {
172172
gridView = view;
173173
_gridDataController = GridDataController(view: view);
174-
final result = await _gridDataController!.openGrid();
175-
result.fold((l) => null, (r) => throw Exception(r));
174+
await openGrid();
176175
},
177176
(error) {},
178177
);
179178
}
180179

180+
Future<void> openGrid() async {
181+
final result = await _gridDataController!.openGrid();
182+
result.fold((l) => null, (r) => throw Exception(r));
183+
}
184+
181185
Future<void> createTestBoard() async {
182186
final app = await unitTest.createTestApp();
183187
final builder = BoardPluginBuilder();

frontend/rust-lib/flowy-revision/src/rev_persistence.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,20 @@ where
126126
};
127127

128128
let revisions = self.revisions_in_range(&range).await?;
129+
let rev_ids = range.to_rev_ids();
129130
debug_assert_eq!(range.len() as usize, revisions.len());
130131
// compact multiple revisions into one
131132
let merged_revision = rev_compress.merge_revisions(&self.user_id, &self.object_id, revisions)?;
132133
tracing::Span::current().record("rev_id", &merged_revision.rev_id);
133-
let _ = sync_seq.recv(merged_revision.rev_id)?;
134134

135-
// replace the revisions in range with compact revision
136-
self.compact(&range, merged_revision).await?;
135+
let record = SyncRecord {
136+
revision: merged_revision,
137+
state: RevisionState::Sync,
138+
write_to_disk: true,
139+
};
140+
let _ = self
141+
.disk_cache
142+
.delete_and_insert_records(&self.object_id, Some(rev_ids), vec![record])?;
137143
}
138144
Ok(())
139145
}

0 commit comments

Comments
 (0)