github-mirrors/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2025-04-24 22:57:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix/calendar event update (#2442)

Browse source 
* fix: update event pos on calendar

* fix: replace text field id with date field id
This commit is contained in:
Nathan.fooo 2023-05-03 15:47:09 +08:00 • committed by GitHub
parent 39b1ff0910
commit 75262c0683
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 75 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

101
frontend/appflowy_flutter/lib/plugins/database_view/calendar/application/calendar_bloc.dart
View file

@ -46,7 +46,13 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
emit(state.copyWith(database: Some(database))); emit(state.copyWith(database: Some(database)));
}, },
didLoadAllEvents: (events) { didLoadAllEvents: (events) {
emit(state.copyWith(initialEvents: events, allEvents: events)); final calenderEvents = _calendarEventDataFromEventPBs(events);
emit(
state.copyWith(
initialEvents: calenderEvents,
allEvents: calenderEvents,
),
);
}, },
didReceiveNewLayoutField: (CalendarLayoutSettingsPB layoutSettings) { didReceiveNewLayoutField: (CalendarLayoutSettingsPB layoutSettings) {
_loadAllEvents(); _loadAllEvents();
@ -57,9 +63,7 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
}, },
didCreateEvent: (CalendarEventData<CalendarDayEvent> event) { didCreateEvent: (CalendarEventData<CalendarDayEvent> event) {
emit( emit(
state.copyWith( state.copyWith(editEvent: event),
createdEvent: event,
),
); );
}, },
updateCalendarLayoutSetting: updateCalendarLayoutSetting:
@ -69,7 +73,7 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
didUpdateEvent: (CalendarEventData<CalendarDayEvent> eventData) { didUpdateEvent: (CalendarEventData<CalendarDayEvent> eventData) {
var allEvents = [...state.allEvents]; var allEvents = [...state.allEvents];
final index = allEvents.indexWhere( final index = allEvents.indexWhere(
(element) => element.event!.cellId == eventData.event!.cellId, (element) => element.event!.eventId == eventData.event!.eventId,
); );
if (index != -1) { if (index != -1) {
allEvents[index] = eventData; allEvents[index] = eventData;
@ -83,7 +87,7 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
didDeleteEvents: (List<String> deletedRowIds) { didDeleteEvents: (List<String> deletedRowIds) {
var events = [...state.allEvents]; var events = [...state.allEvents];
events.retainWhere( events.retainWhere(
(element) => !deletedRowIds.contains(element.event!.cellId.rowId), (element) => !deletedRowIds.contains(element.event!.eventId),
); );
emit( emit(
state.copyWith( state.copyWith(
@ -208,15 +212,7 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
result.fold( result.fold(
(events) { (events) {
if (!isClosed) { if (!isClosed) {
final calendarEvents = <CalendarEventData<CalendarDayEvent>>[]; add(CalendarEvent.didLoadAllEvents(events.items));
for (final eventPB in events.items) {
final calendarEvent = _calendarEventDataFromEventPB(eventPB);
if (calendarEvent != null) {
calendarEvents.add(calendarEvent);
}
}
add(CalendarEvent.didLoadAllEvents(calendarEvents));
} }
}, },
(r) => Log.error(r), (r) => Log.error(r),
@ -224,20 +220,28 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
}); });
} }
List<CalendarEventData<CalendarDayEvent>> _calendarEventDataFromEventPBs(
List<CalendarEventPB> eventPBs,
) {
final calendarEvents = <CalendarEventData<CalendarDayEvent>>[];
for (final eventPB in eventPBs) {
final event = _calendarEventDataFromEventPB(eventPB);
if (event != null) {
calendarEvents.add(event);
}
}
return calendarEvents;
}
CalendarEventData<CalendarDayEvent>? _calendarEventDataFromEventPB( CalendarEventData<CalendarDayEvent>? _calendarEventDataFromEventPB(
CalendarEventPB eventPB, CalendarEventPB eventPB,
) { ) {
final fieldInfo = fieldInfoByFieldId[eventPB.titleFieldId]; final fieldInfo = fieldInfoByFieldId[eventPB.dateFieldId];
if (fieldInfo != null) { if (fieldInfo != null) {
final cellId = CellIdentifier(
viewId: viewId,
rowId: eventPB.rowId,
fieldInfo: fieldInfo,
);
final eventData = CalendarDayEvent( final eventData = CalendarDayEvent(
event: eventPB, event: eventPB,
cellId: cellId, eventId: eventPB.rowId,
dateFieldId: eventPB.dateFieldId,
); );
// The timestamp is using UTC in the backend, so we need to convert it // The timestamp is using UTC in the backend, so we need to convert it
@ -266,25 +270,29 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
for (var fieldInfo in fieldInfos) fieldInfo.field.id: fieldInfo for (var fieldInfo in fieldInfos) fieldInfo.field.id: fieldInfo
}; };
}, },
onRowsChanged: ((onRowsChanged, rowByRowId, reason) {}), onRowsCreated: ((rowIds) async {
onRowsCreated: ((ids) async { for (final id in rowIds) {
for (final id in ids) {
final event = await _loadEvent(id); final event = await _loadEvent(id);
if (event != null && !isClosed) { if (event != null && !isClosed) {
add(CalendarEvent.didReceiveEvent(event)); add(CalendarEvent.didReceiveEvent(event));
} }
} }
}), }),
onRowsDeleted: (ids) { onRowsDeleted: (rowIds) {
if (isClosed) return; if (isClosed) return;
add(CalendarEvent.didDeleteEvents(ids)); add(CalendarEvent.didDeleteEvents(rowIds));
}, },
onRowsUpdated: (ids) async { onRowsUpdated: (rowIds) async {
if (isClosed) return; if (isClosed) return;
for (final id in ids) { for (final id in rowIds) {
final event = await _loadEvent(id); final event = await _loadEvent(id);
if (event != null) { if (event != null && isEventDayChanged(event)) {
add(CalendarEvent.didUpdateEvent(event)); if (isEventDayChanged(event)) {
add(CalendarEvent.didDeleteEvents([id]));
add(CalendarEvent.didReceiveEvent(event));
} else {
add(CalendarEvent.didUpdateEvent(event));
}
} }
} }
}, },
@ -319,6 +327,19 @@ class CalendarBloc extends Bloc<CalendarEvent, CalendarState> {
add(CalendarEvent.didReceiveNewLayoutField(layoutSetting.calendar)); add(CalendarEvent.didReceiveNewLayoutField(layoutSetting.calendar));
} }
} }
bool isEventDayChanged(
CalendarEventData<CalendarDayEvent> event,
) {
final index = state.allEvents.indexWhere(
(element) => element.event!.eventId == event.event!.eventId,
);
if (index != -1) {
return state.allEvents[index].date.day != event.date.day;
} else {
return false;
}
}
} }
typedef Events = List<CalendarEventData<CalendarDayEvent>>; typedef Events = List<CalendarEventData<CalendarDayEvent>>;
@ -333,7 +354,7 @@ class CalendarEvent with _$CalendarEvent {
) = _ReceiveCalendarSettings; ) = _ReceiveCalendarSettings;
// Called after loading all the current evnets // Called after loading all the current evnets
const factory CalendarEvent.didLoadAllEvents(Events events) = const factory CalendarEvent.didLoadAllEvents(List<CalendarEventPB> events) =
_ReceiveCalendarEvents; _ReceiveCalendarEvents;
// Called when specific event was updated // Called when specific event was updated
@ -376,9 +397,10 @@ class CalendarEvent with _$CalendarEvent {
class CalendarState with _$CalendarState { class CalendarState with _$CalendarState {
const factory CalendarState({ const factory CalendarState({
required Option<DatabasePB> database, required Option<DatabasePB> database,
// events by row id
required Events allEvents, required Events allEvents,
required Events initialEvents, required Events initialEvents,
CalendarEventData<CalendarDayEvent>? createdEvent, CalendarEventData<CalendarDayEvent>? editEvent,
CalendarEventData<CalendarDayEvent>? newEvent, CalendarEventData<CalendarDayEvent>? newEvent,
required List<String> deleteEventIds, required List<String> deleteEventIds,
required Option<CalendarLayoutSettingsPB> settings, required Option<CalendarLayoutSettingsPB> settings,
@ -417,9 +439,12 @@ class CalendarEditingRow {
class CalendarDayEvent { class CalendarDayEvent {
final CalendarEventPB event; final CalendarEventPB event;
final CellIdentifier cellId; final String dateFieldId;
final String eventId;
String get eventId => cellId.rowId; CalendarDayEvent({
String get fieldId => cellId.fieldId; required this.dateFieldId,
CalendarDayEvent({required this.cellId, required this.event}); required this.eventId,
required this.event,
});
} }

4
frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_day.dart
View file

@ -190,7 +190,7 @@ class CalendarDayCard extends StatelessWidget {
row: rowInfo!.rowPB, row: rowInfo!.rowPB,
viewId: viewId, viewId: viewId,
rowCache: _rowCache, rowCache: _rowCache,
cardData: event.fieldId, cardData: event.dateFieldId,
isEditing: false, isEditing: false,
cellBuilder: cellBuilder, cellBuilder: cellBuilder,
openCard: (context) => _showRowDetailPage(event, context), openCard: (context) => _showRowDetailPage(event, context),
@ -226,7 +226,7 @@ class CalendarDayCard extends StatelessWidget {
void _showRowDetailPage(CalendarDayEvent event, BuildContext context) { void _showRowDetailPage(CalendarDayEvent event, BuildContext context) {
final dataController = RowController( final dataController = RowController(
rowId: event.cellId.rowId, rowId: event.eventId,
viewId: viewId, viewId: viewId,
rowCache: _rowCache, rowCache: _rowCache,
); );

12
frontend/appflowy_flutter/lib/plugins/database_view/calendar/presentation/calendar_page.dart
View file

@ -73,14 +73,16 @@ class _CalendarPageState extends State<CalendarPage> {
}, },
), ),
BlocListener<CalendarBloc, CalendarState>( BlocListener<CalendarBloc, CalendarState>(
listenWhen: (p, c) => p.createdEvent != c.createdEvent, listenWhen: (p, c) => p.editEvent != c.editEvent,
listener: (context, state) { listener: (context, state) {
if (state.createdEvent != null) { if (state.editEvent != null) {
_showRowDetailPage(state.createdEvent!.event!, context); _showEditEventPage(state.editEvent!.event!, context);
} }
}, },
), ),
BlocListener<CalendarBloc, CalendarState>( BlocListener<CalendarBloc, CalendarState>(
// Event create by click the + button or double click on the
// calendar
listenWhen: (p, c) => p.newEvent != c.newEvent, listenWhen: (p, c) => p.newEvent != c.newEvent,
listener: (context, state) { listener: (context, state) {
if (state.newEvent != null) { if (state.newEvent != null) {
@ -212,9 +214,9 @@ class _CalendarPageState extends State<CalendarPage> {
return WeekDays.values[(dayOfWeek + 1) % 7]; return WeekDays.values[(dayOfWeek + 1) % 7];
} }
void _showRowDetailPage(CalendarDayEvent event, BuildContext context) { void _showEditEventPage(CalendarDayEvent event, BuildContext context) {
final dataController = RowController( final dataController = RowController(
rowId: event.cellId.rowId, rowId: event.eventId,
viewId: widget.view.id, viewId: widget.view.id,
rowCache: _calendarBloc.rowCache, rowCache: _calendarBloc.rowCache,
); );

2
frontend/rust-lib/flowy-database/src/entities/calendar_entities.rs
View file

@ -108,7 +108,7 @@ pub struct CalendarEventPB {
pub row_id: String, pub row_id: String,
#[pb(index = 2)] #[pb(index = 2)]
pub title_field_id: String, pub date_field_id: String,
#[pb(index = 3)] #[pb(index = 3)]
pub title: String, pub title: String,

5
frontend/rust-lib/flowy-database/src/services/database_view/editor.rs
View file

@ -867,7 +867,7 @@ impl DatabaseViewEditor {
Some(CalendarEventPB { Some(CalendarEventPB {
row_id: row_id.to_string(), row_id: row_id.to_string(),
title_field_id: primary_field.id.clone(), date_field_id: date_field.id.clone(),
title, title,
timestamp, timestamp,
}) })
@ -906,7 +906,6 @@ impl DatabaseViewEditor {
let mut events: Vec<CalendarEventPB> = vec![]; let mut events: Vec<CalendarEventPB> = vec![];
for text_cell in text_cells { for text_cell in text_cells {
let title_field_id = text_cell.field_id.clone();
let row_id = text_cell.row_id.clone(); let row_id = text_cell.row_id.clone();
let timestamp = timestamp_by_row_id let timestamp = timestamp_by_row_id
.get(&row_id) .get(&row_id)
@ -920,7 +919,7 @@ impl DatabaseViewEditor {
let event = CalendarEventPB { let event = CalendarEventPB {
row_id, row_id,
title_field_id, date_field_id: calendar_setting.layout_field_id.clone(),
title, title,
timestamp, timestamp,
}; };